Merge pull request #227 from alephium/announce-provider

Announce the injected provider
alephium · Nov 19, 2024 · f16a74d · f16a74d
2 parents 3793ee9 + aef76e0
commit f16a74d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/packages/extension/src/inpage/alephiumWindowObject.ts b/packages/extension/src/inpage/alephiumWindowObject.ts
@@ -116,12 +116,6 @@ export const alephiumWindowObject: AlephiumWindowObject =
         throw Error("User aborted")
       }
 
-      const { alephiumProviders } = window
-      const alephium = alephiumProviders?.alephium
-      if (!alephium) {
-        throw Error("No alephium object detected")
-      }
-
       const account = {
         address: walletAccount.address,
         publicKey: walletAccount.signer.publicKey,

diff --git a/packages/extension/src/inpage/index.ts b/packages/extension/src/inpage/index.ts
@@ -52,7 +52,17 @@ function attachNostrProvider() {
   }
 }
 
+function announceProvider() {
+  const event = new CustomEvent('announceAlephiumProvider', {
+    detail: Object.freeze({ provider: alephiumWindowObject })
+  })
+  const handler = () => window.dispatchEvent(event)
+  handler()
+  window.addEventListener('requestAlephiumProvider', handler)
+}
+
 function attach() {
+  announceProvider()
   attachAlephiumProvider()
   attachNostrProvider()
 }
@@ -62,15 +72,8 @@ attach()
 window.addEventListener(
   "message",
   async ({ data }: MessageEvent<WindowMessageType>) => {
-    const { alephiumProviders } = window
-    const alephium = alephiumProviders?.alephium
-
-    if (!alephium) {
-      return
-    }
-
     if (data.type === "ALPH_DISCONNECT_ACCOUNT") {
-      await alephium.disconnect()
+      await alephiumWindowObject.disconnect()
     }
   },
 )
diff --git a/packages/extension/src/inpage/inpage.model.ts b/packages/extension/src/inpage/inpage.model.ts
@@ -43,6 +43,11 @@ declare global {
     alephiumProviders?: Record<string, AlephiumWindowObject>
     nostr?: NostrObject
   }
+
+  interface WindowEventMap {
+    'announceAlephiumProvider': CustomEvent,
+    'requestAlephiumProvider': Event
+  }
 }
 
 export interface NostrObject {