@meshconnect/uwc-core 1.0.1-snapshot.c7e65ce → 1.0.2

package/src/services/connection-service.test.ts

@@ -81,8 +81,7 @@ describe('ConnectionService', () => {
       sessionManager,
       connectors,
       false,
-      eventManager,
-      60_000
+      eventManager
     )
   })
 
@@ -194,70 +193,6 @@ describe('ConnectionService', () => {
       expect(connectingListener).not.toHaveBeenCalled()
     })
 
-    it('does NOT emit awaitingWallet when validation throws (pre-wallet failure stays out of the funnel)', async () => {
-      const awaiting = vi.fn()
-      const failed = vi.fn()
-      eventManager.on('awaitingWallet', awaiting)
-      eventManager.on('walletFailed', failed)
-
-      await expect(
-        connectionService.connect('injected', 'no-such-wallet', 'eip155:1')
-      ).rejects.toThrow()
-
-      expect(awaiting).not.toHaveBeenCalled()
-      expect(failed).not.toHaveBeenCalled()
-    })
-
-    it('emits awaitingWallet + walletSucceeded around the wallet call, with resolved facets', async () => {
-      wallets[0].extensionInjectedProvider = {
-        supportedNetworkIds: ['eip155:1']
-      } as any
-      const events: Array<{ name: string; data: any }> = []
-      eventManager.on('awaitingWallet', d =>
-        events.push({ name: 'awaitingWallet', data: d })
-      )
-      eventManager.on('walletSucceeded', d =>
-        events.push({ name: 'walletSucceeded', data: d })
-      )
-      mockConnector.connect = vi.fn().mockResolvedValue({
-        networkId: 'eip155:1',
-        address: '0x1234',
-        availableAddresses: [{ address: '0x1234', networkId: 'eip155:1' }]
-      })
-
-      await connectionService.connect('injected', 'metamask', 'eip155:1')
-
-      expect(events.map(e => e.name)).toEqual([
-        'awaitingWallet',
-        'walletSucceeded'
-      ])
-      const awaiting = events[0].data
-      expect(awaiting.operation).toBe('connect')
-      expect(awaiting.namespace).toBe('eip155')
-      expect(awaiting.chainId).toBe('eip155:1')
-      expect(awaiting.handoffId).toBe(events[1].data.handoffId)
-    })
-
-    it('emits awaitingWallet + walletFailed when the connector call throws', async () => {
-      wallets[0].extensionInjectedProvider = {
-        supportedNetworkIds: ['eip155:1']
-      } as any
-      const awaiting = vi.fn()
-      const failed = vi.fn()
-      eventManager.on('awaitingWallet', awaiting)
-      eventManager.on('walletFailed', failed)
-      mockConnector.connect = vi
-        .fn()
-        .mockRejectedValue(new Error('wallet exploded'))
-
-      await expect(
-        connectionService.connect('injected', 'metamask', 'eip155:1')
-      ).rejects.toThrow('wallet exploded')
-
-      expect(awaiting).toHaveBeenCalledTimes(1)
-      expect(failed).toHaveBeenCalledTimes(1)
-    })
-
     it('rejects mid-flight when AbortSignal fires during connector.connect', async () => {
       wallets[0].extensionInjectedProvider = {
         supportedNetworkIds: ['eip155:1']

package/src/services/connection-service.ts

@@ -13,7 +13,6 @@ import type {
 import type { SessionManager } from '../managers/session-manager'
 import type { EventManager } from '../managers/event-manager'
 import { raceAbort } from '../utils/abort'
-import { instrumentHandoff } from '../observability/instrument-handoff'
 
 export interface ServiceOptions {
   signal?: AbortSignal
@@ -28,9 +27,7 @@ export class ConnectionService {
     private sessionManager: SessionManager,
     private connectors: Map<ConnectionMode, Connector>,
     private usingIntegratedBrowser: boolean,
-    private eventManager: EventManager,
-    // Observational wallet-response deadline for the handoff timeout marker.
-    private walletResponseTimeoutMs: number
+    private eventManager: EventManager
   ) {}
 
   async connect(
@@ -63,56 +60,37 @@ export class ConnectionService {
 
     let result
     try {
-      // Instrument the wallet hand-off HERE — after validation + the `connecting`
-      // emit — so `awaitingWallet` marks the real wallet boundary. A pre-wallet
-      // lookup/validation failure throws above and never enters the funnel. The
-      // resolved `network` gives accurate namespace/chainId facets.
-      result = await instrumentHandoff(
-        {
-          eventManager: this.eventManager,
-          timeoutMs: this.walletResponseTimeoutMs
-        },
-        {
-          operation: 'connect',
-          connectionMode,
-          walletId,
-          namespace: network.namespace,
-          chainId: network.id
-        },
-        async () => {
-          // Race the connector call against the AbortSignal so a mid-flight abort
-          // (e.g. user cancels the WalletConnect QR while the prompt is open)
-          // rejects the caller's await promptly. The underlying wallet prompt
-          // itself can't be cancelled, but the dapp UI is no longer blocked on it.
-          if (connectionMode === 'injected') {
-            return await raceAbort(
-              connector.connect(
-                network,
-                provider as
-                  | ExtensionInjectedProvider
-                  | IntegratedBrowserInjectedProvider
-              ),
-              options?.signal
-            )
-          } else if (
-            connectionMode === 'tonConnect' ||
-            connectionMode === 'walletConnect'
-          ) {
-            return await raceAbort(
-              this.connectWithURIPoll(
-                connector,
-                network,
-                provider,
-                connectionMode,
-                options?.signal
-              ),
-              options?.signal
-            )
-          } else {
-            throw new Error(`Unsupported connection mode: ${connectionMode}`)
-          }
-        }
-      )
+      // Race the connector call against the AbortSignal so a mid-flight abort
+      // (e.g. user cancels the WalletConnect QR while the prompt is open)
+      // rejects the caller's await promptly. The underlying wallet prompt
+      // itself can't be cancelled, but the dapp UI is no longer blocked on it.
+      if (connectionMode === 'injected') {
+        result = await raceAbort(
+          connector.connect(
+            network,
+            provider as
+              | ExtensionInjectedProvider
+              | IntegratedBrowserInjectedProvider
+          ),
+          options?.signal
+        )
+      } else if (
+        connectionMode === 'tonConnect' ||
+        connectionMode === 'walletConnect'
+      ) {
+        result = await raceAbort(
+          this.connectWithURIPoll(
+            connector,
+            network,
+            provider,
+            connectionMode,
+            options?.signal
+          ),
+          options?.signal
+        )
+      } else {
+        throw new Error(`Unsupported connection mode: ${connectionMode}`)
+      }
     } catch (error) {
       this.activeConnector = null
       throw error

package/src/services/network-switch-service.test.ts

@@ -84,8 +84,7 @@ describe('NetworkSwitchService', () => {
       sessionManager,
       connectors,
       false,
-      eventManager,
-      60_000
+      eventManager
     )
   })
 
@@ -185,53 +184,4 @@ describe('NetworkSwitchService', () => {
       "Wallet 'metamask' does not have a provider for injected mode"
     )
   })
-
-  it('does NOT emit awaitingWallet when validation throws (no active wallet)', async () => {
-    const awaiting = vi.fn()
-    eventManager.on('awaitingWallet', awaiting)
-
-    await expect(
-      networkSwitchService.switchNetwork('eip155:1')
-    ).rejects.toThrow()
-
-    expect(awaiting).not.toHaveBeenCalled()
-  })
-
-  it('emits awaitingWallet + walletSucceeded around the wallet switch call', async () => {
-    sessionManager.updateSession({
-      connectionMode: 'injected',
-      activeWallet: {
-        id: 'metamask',
-        name: 'MetaMask',
-        metadata: {
-          icon: 'test',
-          downloadUrl: 'test',
-          supportedChains: ['eip155:1', 'eip155:137']
-        },
-        extensionInjectedProvider: {
-          supportedNetworkIds: ['eip155:1', 'eip155:137']
-        }
-      } as any
-    })
-    mockConnector.switchNetwork = vi.fn().mockResolvedValue({
-      address: '0xabc',
-      availableAddresses: [{ address: '0xabc', networkId: 'eip155:137' }]
-    })
-    const events: Array<{ name: string; data: any }> = []
-    eventManager.on('awaitingWallet', d =>
-      events.push({ name: 'awaitingWallet', data: d })
-    )
-    eventManager.on('walletSucceeded', d =>
-      events.push({ name: 'walletSucceeded', data: d })
-    )
-
-    await networkSwitchService.switchNetwork('eip155:137')
-
-    expect(events.map(e => e.name)).toEqual([
-      'awaitingWallet',
-      'walletSucceeded'
-    ])
-    expect(events[0].data.operation).toBe('switchNetwork')
-    expect(events[0].data.chainId).toBe('eip155:137')
-  })
 })

package/src/services/network-switch-service.ts

@@ -12,7 +12,6 @@ import type {
 import type { SessionManager } from '../managers/session-manager'
 import type { EventManager } from '../managers/event-manager'
 import type { ServiceOptions } from './connection-service'
-import { instrumentHandoff } from '../observability/instrument-handoff'
 
 export class NetworkSwitchService {
   private isLoading = false
@@ -23,9 +22,7 @@ export class NetworkSwitchService {
     private sessionManager: SessionManager,
     private connectors: Map<ConnectionMode, Connector>,
     private usingIntegratedBrowser: boolean,
-    private eventManager: EventManager,
-    // Observational wallet-response deadline for the handoff timeout marker.
-    private walletResponseTimeoutMs: number
+    private eventManager: EventManager
   ) {}
 
   getLoadingState() {
@@ -118,45 +115,28 @@ export class NetworkSwitchService {
         isWaitingForUserApproval: requiresApproval
       })
 
-      // Perform the network switch and get the new address. Instrument the
-      // wallet hand-off HERE — after validation + the `networkSwitching` emit —
-      // so `awaitingWallet` marks the real wallet boundary; pre-wallet validation
-      // failures throw above and never enter the funnel.
-      // Pass the appropriate provider based on connection mode.
-      const result = await instrumentHandoff(
-        {
-          eventManager: this.eventManager,
-          timeoutMs: this.walletResponseTimeoutMs
-        },
-        {
-          operation: 'switchNetwork',
-          connectionMode: session.connectionMode,
-          walletId: currentWallet.id,
-          namespace: network.namespace,
-          chainId: network.id
-        },
-        async () => {
-          if (
-            (session.connectionMode === 'injected' ||
-              session.connectionMode === 'tonConnect') &&
-            provider
-          ) {
-            return await activeConnector.switchNetwork(
-              network,
-              provider as
-                | ExtensionInjectedProvider
-                | IntegratedBrowserInjectedProvider
-            )
-          } else if (session.connectionMode === 'walletConnect' && provider) {
-            return await activeConnector.switchNetwork(
-              network,
-              provider as WalletConnectProvider
-            )
-          } else {
-            return await activeConnector.switchNetwork(network)
-          }
-        }
-      )
+      // Perform the network switch and get the new address
+      // Pass the appropriate provider based on connection mode
+      let result
+      if (
+        (session.connectionMode === 'injected' ||
+          session.connectionMode === 'tonConnect') &&
+        provider
+      ) {
+        result = await activeConnector.switchNetwork(
+          network,
+          provider as
+            | ExtensionInjectedProvider
+            | IntegratedBrowserInjectedProvider
+        )
+      } else if (session.connectionMode === 'walletConnect' && provider) {
+        result = await activeConnector.switchNetwork(
+          network,
+          provider as WalletConnectProvider
+        )
+      } else {
+        result = await activeConnector.switchNetwork(network)
+      }
 
       options?.signal?.throwIfAborted()