@tomo-inc/inject-providers 0.0.15 → 0.0.17

package/dist/index.cjs

@@ -35,13 +35,12 @@ var __spreadValues = (a, b) => {
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 
 // src/utils/dapp-info.ts
-var $ = document.querySelector.bind(document);
 async function getDappInfo() {
   var _a;
   return {
     origin: (_a = window.top) == null ? void 0 : _a.location.origin,
     // host: window.location.hostname,
-    favicon: await getSiteIcon(),
+    favicon: await getSiteIcon(window),
     title: getSiteName(window),
     desc: getSiteDesc(window)
   };
@@ -82,13 +81,17 @@ function getSiteDesc(windowObject) {
 }
 async function getSiteIcon(windowObject) {
   var _a, _b;
-  const icon = ((_a = $('head > link[rel~="icon"]')) == null ? void 0 : _a.href) || ((_b = $('head > meta[itemprop="image"]')) == null ? void 0 : _b.content);
+  const doc = windowObject.document;
+  const icon = ((_a = doc.querySelector('head > link[rel~="icon"]')) == null ? void 0 : _a.href) || ((_b = doc.querySelector('head > meta[itemprop="image"]')) == null ? void 0 : _b.content);
   if (!icon) {
     return "";
   }
-  const isOK = await imgExists(icon);
-  if (isOK) {
-    return icon;
+  try {
+    const isOK = await imgExists(icon);
+    if (isOK) {
+      return icon;
+    }
+  } catch (e) {
   }
   return "";
 }
@@ -1036,7 +1039,7 @@ var EvmProvider = class extends events.EventEmitter {
       if (method2 in connectFuns && connectFuns[method2]) {
         this._handleAccountsChanged(data || [], true);
       }
-      if (method2 === "wallet_switchEthereumChain" || method2 === "eth_chainId") {
+      if (method2 === "wallet_switchEthereumChain") {
         this._handleChainChanged({ chainId: data, isConnected: true });
       }
       return data;
@@ -1574,6 +1577,9 @@ var PhantomProvider = class extends events.EventEmitter {
       );
     };
     this.getAccount = async () => {
+      if (this.publicKey) {
+        return { publicKey: this.publicKey, address: this.publicKey.toBase58() };
+      }
       return this._request({
         method: "getAccount",
         params: {}
@@ -1660,7 +1666,8 @@ Resources:`;
           }
         },
         (data) => {
-          return hexToTx(data.signature);
+          const hex = typeof data === "string" ? data : data.signature;
+          return hexToTx(hex);
         }
       );
     };
@@ -1690,9 +1697,10 @@ Resources:`;
           }
         },
         (data) => {
-          if (data && data.signature) {
-            const signature = bs58__default.default.decode(data.signature);
-            data = __spreadValues(__spreadValues({}, data), { signature });
+          const sig = typeof data === "string" ? data : data == null ? void 0 : data.signature;
+          if (sig) {
+            const signature = bs58__default.default.decode(sig);
+            return { signature };
           }
           return data;
         }

package/dist/index.js

@@ -29,13 +29,12 @@ var __spreadValues = (a, b) => {
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 
 // src/utils/dapp-info.ts
-var $ = document.querySelector.bind(document);
 async function getDappInfo() {
   var _a;
   return {
     origin: (_a = window.top) == null ? void 0 : _a.location.origin,
     // host: window.location.hostname,
-    favicon: await getSiteIcon(),
+    favicon: await getSiteIcon(window),
     title: getSiteName(window),
     desc: getSiteDesc(window)
   };
@@ -76,13 +75,17 @@ function getSiteDesc(windowObject) {
 }
 async function getSiteIcon(windowObject) {
   var _a, _b;
-  const icon = ((_a = $('head > link[rel~="icon"]')) == null ? void 0 : _a.href) || ((_b = $('head > meta[itemprop="image"]')) == null ? void 0 : _b.content);
+  const doc = windowObject.document;
+  const icon = ((_a = doc.querySelector('head > link[rel~="icon"]')) == null ? void 0 : _a.href) || ((_b = doc.querySelector('head > meta[itemprop="image"]')) == null ? void 0 : _b.content);
   if (!icon) {
     return "";
   }
-  const isOK = await imgExists(icon);
-  if (isOK) {
-    return icon;
+  try {
+    const isOK = await imgExists(icon);
+    if (isOK) {
+      return icon;
+    }
+  } catch (e) {
   }
   return "";
 }
@@ -1030,7 +1033,7 @@ var EvmProvider = class extends EventEmitter {
       if (method2 in connectFuns && connectFuns[method2]) {
         this._handleAccountsChanged(data || [], true);
       }
-      if (method2 === "wallet_switchEthereumChain" || method2 === "eth_chainId") {
+      if (method2 === "wallet_switchEthereumChain") {
         this._handleChainChanged({ chainId: data, isConnected: true });
       }
       return data;
@@ -1568,6 +1571,9 @@ var PhantomProvider = class extends EventEmitter {
       );
     };
     this.getAccount = async () => {
+      if (this.publicKey) {
+        return { publicKey: this.publicKey, address: this.publicKey.toBase58() };
+      }
       return this._request({
         method: "getAccount",
         params: {}
@@ -1654,7 +1660,8 @@ Resources:`;
           }
         },
         (data) => {
-          return hexToTx(data.signature);
+          const hex = typeof data === "string" ? data : data.signature;
+          return hexToTx(hex);
         }
       );
     };
@@ -1684,9 +1691,10 @@ Resources:`;
           }
         },
         (data) => {
-          if (data && data.signature) {
-            const signature = bs58.decode(data.signature);
-            data = __spreadValues(__spreadValues({}, data), { signature });
+          const sig = typeof data === "string" ? data : data == null ? void 0 : data.signature;
+          if (sig) {
+            const signature = bs58.decode(sig);
+            return { signature };
           }
           return data;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomo-inc/inject-providers",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "author": "tomo.inc",
   "license": "MIT",
   "private": false,
@@ -25,12 +25,13 @@
     "json-rpc-middleware-stream": "^3.0.0",
     "tronweb": "^6.0.3",
     "viem": "^2.38.3",
-    "@tomo-inc/wallet-utils": "0.0.17"
+    "@tomo-inc/wallet-utils": "0.0.19"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",
     "@types/supertest": "^2.0.12",
     "@vitest/browser": "^3.2.4",
+    "@vitest/coverage-v8": "^3.2.4",
     "playwright": "^1.44.1",
     "supertest": "^6.3.0",
     "tsup": "^8.0.0",

package/project.json

@@ -50,7 +50,7 @@
       "executor": "nx:run-commands",
       "outputs": ["{projectRoot}/coverage"],
       "options": {
-        "command": "vitest run",
+        "command": "vitest run --coverage",
         "cwd": "packages/inject-providers"
       }
     },