fix: dapp connection (#722)

rainbow-me · Jul 13, 2023 · b5cb257 · b5cb257
1 parent aa765b0
commit b5cb257
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 21 deletions.
diff --git a/src/core/providers/RainbowProvider.ts b/src/core/providers/RainbowProvider.ts
@@ -4,6 +4,7 @@ import { EventEmitter } from 'eventemitter3';
 import { Messenger } from '../messengers';
 import { providerRequestTransport } from '../transports';
 import { RPCMethod } from '../types/rpcMethods';
+import { getDappHost, isValidUrl } from '../utils/connectedApps';
 import { toHex } from '../utils/hex';
 
 export type ChainIdHex = `0x${string}`;
@@ -55,26 +56,31 @@ export class RainbowProvider extends EventEmitter {
 
   constructor({ messenger }: { messenger?: Messenger } = {}) {
     super();
-    const host = window.location.host;
-    messenger?.reply(`accountsChanged:${host}`, async (address) => {
-      this.emit('accountsChanged', [address]);
-    });
-    messenger?.reply(`chainChanged:${host}`, async (chainId: number) => {
-      this.emit('chainChanged', toHex(String(chainId)));
-    });
-    messenger?.reply(`disconnect:${host}`, async () => {
-      this.emit('disconnect');
-      this.emit('accountsChanged', []);
-    });
-    messenger?.reply(`connect:${host}`, async (connectionInfo) => {
-      this.emit('connect', connectionInfo);
-    });
-    messenger?.reply(
-      'rainbow_setDefaultProvider',
-      async ({ rainbowAsDefault }: { rainbowAsDefault: boolean }) => {
-        this.rainbowIsDefaultProvider = rainbowAsDefault;
-      },
-    );
+
+    // RainbowProvider is also used in popup via RainbowConnector
+    // here we don't need to listen to anything so we don't need these listeners
+    if (isValidUrl(window.location.href)) {
+      const host = getDappHost(window.location.href);
+      messenger?.reply(`accountsChanged:${host}`, async (address) => {
+        this.emit('accountsChanged', [address]);
+      });
+      messenger?.reply(`chainChanged:${host}`, async (chainId: number) => {
+        this.emit('chainChanged', toHex(String(chainId)));
+      });
+      messenger?.reply(`disconnect:${host}`, async () => {
+        this.emit('disconnect');
+        this.emit('accountsChanged', []);
+      });
+      messenger?.reply(`connect:${host}`, async (connectionInfo) => {
+        this.emit('connect', connectionInfo);
+      });
+      messenger?.reply(
+        'rainbow_setDefaultProvider',
+        async ({ rainbowAsDefault }: { rainbowAsDefault: boolean }) => {
+          this.rainbowIsDefaultProvider = rainbowAsDefault;
+        },
+      );
+    }
   }
 
   /**

diff --git a/src/core/utils/connectedApps.ts b/src/core/utils/connectedApps.ts
@@ -1,3 +1,12 @@
+export const isValidUrl = (url: string) => {
+  try {
+    new URL(url);
+    return true;
+  } catch (err) {
+    return false;
+  }
+};
+
 export const getDappHost = (url: string) => {
   const host = new URL(url).host;
   if (host.indexOf('www.') === 0) {

diff --git a/src/entries/inpage/index.ts b/src/entries/inpage/index.ts
@@ -3,6 +3,7 @@ import { Ethereum } from '@wagmi/core';
 import { initializeMessenger } from '~/core/messengers';
 import { RainbowProvider } from '~/core/providers';
 import { ChainId } from '~/core/types/chains';
+import { getDappHost } from '~/core/utils/connectedApps';
 
 import { injectNotificationIframe } from '../iframe';
 
@@ -142,7 +143,7 @@ backgroundMessenger.reply(
     extensionUrl: string;
     host: string;
   }) => {
-    if (window.location.hostname === host) {
+    if (getDappHost(window.location.href) === host) {
       injectNotificationIframe({ chainId, status, extensionUrl });
     }
   },