Skip to content

Commit

Permalink
fix: pairing on second tab
Browse files Browse the repository at this point in the history
  • Loading branch information
@IsaccoSordo
IsaccoSordo committed Sep 25, 2024
1 parent 9fdffaf commit 1809312
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 128 deletions.
2 changes: 1 addition & 1 deletion packages/beacon-core/src/utils/multi-tab-channel.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ export class MultiTabChannel {
await this.elector.awaitLeadership()
this.wasLeader = this.elector.isLeader
this.wasLeader && logger.log('The current tab is the leader.')
this._isLeader.resolve(this.wasLeader)
}

this._isLeader.resolve(this.wasLeader)
this.channel.onmessage = this.eventListeners[1]
window?.addEventListener('beforeunload', this.eventListeners[0])
}
Expand Down
147 changes: 28 additions & 119 deletions packages/beacon-dapp/src/dapp-client/DAppClient.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,9 +232,6 @@ export class DAppClient extends Client {
this.onElectedLeaderhandler.bind(this)
)

private pairingRequest: ExposedPromise<string> | undefined
private pairingResponse: { message: BeaconMessage; connectionInfo: ConnectionContext } | undefined

constructor(config: DAppClientOptions) {
super({
storage: config && config.storage ? config.storage : new LocalStorage(),
Expand Down Expand Up @@ -494,82 +491,11 @@ export class DAppClient extends Client {
case 'DISCONNECT':
this._transport.isResolved() && this.disconnect()
break
case 'REQUEST_PAIRING':
this.handlePairingRequest(message.sender)
break
case 'RESPONSE_PAIRING':
this.handlePairingResponse(message.data)
break
case 'NEW_PEER':
this.handleNewPeerBC(message.data)
break
case 'HIDE_UI':
this.hideUI(message.data)
break
default:
logger.error('onBCMessageHandler', 'message type not recognized', message)
}
}

private async handleNewPeerBC(data: any) {
this.pairingResponse = data.response
this.walletConnectTransport?.updatePeerListener(data.peer)
}

private async handlePairingRequest(recipient: string) {
if (!this.multiTabChannel.isLeader()) {
return
}

await this.initInternalTransports()

this.walletConnectTransport
?.listenForNewPeer(async (peer) => {
logger.log('init', 'walletconnect transport peer connected', peer)
this.analytics.track('event', 'DAppClient', 'WalletConnect Wallet connected', {
peerName: peer.name
})

this.setActivePeer(peer).catch(console.error)
this.setTransport(this.walletConnectTransport).catch(console.error)

await this.init(this.walletConnectTransport)

const request: PermissionRequestInput = {
appMetadata: await this.getOwnAppMetadata(),
type: BeaconMessageType.PermissionRequest,
network: this.network,
scopes: [PermissionScope.OPERATION_REQUEST, PermissionScope.SIGN] // todo
}

const response = await this.makeRequest<PermissionRequest, PermissionResponse>(request)

await this.hideUI(['toast'])

this.walletConnectTransport?.connect()

this.multiTabChannel.postMessage({
type: 'NEW_PEER',
recipient,
data: {
peer,
response
}
})
})
.catch(console.error)

this.multiTabChannel.postMessage({
type: 'RESPONSE_PAIRING',
recipient,
data: await this.walletConnectTransport?.getPairingRequestInfo()
})
}

private async handlePairingResponse(data: string) {
this.pairingRequest?.resolve(data)
}

private async prepareRequest({ data }: any, isV3 = false) {
if (!this.multiTabChannel.isLeader()) {
return
Expand Down Expand Up @@ -668,10 +594,10 @@ export class DAppClient extends Client {
return
}

this.walletConnectTransport.setEventHandler(
ClientEvents.CLOSE_ALERT,
this.hideUI.bind(this, ['alert', 'toast'])
)
this.walletConnectTransport.setEventHandler(ClientEvents.CLOSE_ALERT, () => {
this.hideUI(['alert', 'toast'])
this.multiTabChannel.postMessage({ type: 'HIDE_UI', data: ['alert', 'toast'] })
})
this.walletConnectTransport.setEventHandler(
ClientEvents.RESET_STATE,
this.channelClosedHandler.bind(this)
Expand Down Expand Up @@ -729,16 +655,6 @@ export class DAppClient extends Client {
await super.destroy()
}

private async getPairingRequestInfo(transport: DappWalletConnectTransport) {
if (await this.multiTabChannel.isLeader()) {
return transport.getPairingRequestInfo()
}

this.pairingRequest = new ExposedPromise()
this.multiTabChannel.postMessage({ type: 'REQUEST_PAIRING' })
return await this.pairingRequest.promise
}

public async init(transport?: Transport<any>): Promise<TransportType> {
if (this._initPromise) {
return this._initPromise
Expand Down Expand Up @@ -863,7 +779,7 @@ export class DAppClient extends Client {
return p2pTransport.getPairingRequestInfo()
},
postmessagePeerInfo: () => postMessageTransport.getPairingRequestInfo(),
walletConnectPeerInfo: () => this.getPairingRequestInfo(walletConnectTransport),
walletConnectPeerInfo: () => walletConnectTransport.getPairingRequestInfo(),
networkType: this.network.type,
abortedHandler: async () => {
logger.log('init', 'ABORTED')
Expand Down Expand Up @@ -2399,11 +2315,7 @@ export class DAppClient extends Client {
ErrorResponse
>()

if (this.pairingResponse) {
exposed.resolve(this.pairingResponse)
} else {
this.addOpenRequest(request.id, exposed)
}
this.addOpenRequest(request.id, exposed)
}

const payload = await new Serializer().serialize(request)
Expand All @@ -2415,32 +2327,29 @@ export class DAppClient extends Client {
const walletInfo = await this.getWalletInfo(peer, account)

logger.log('makeRequest', 'sending message', request)
if (!this.pairingResponse) {
try {
;(await this.transport).send(payload, peer)
if (
request.type !== BeaconMessageType.PermissionRequest ||
(this._activeAccount.isResolved() && (await this._activeAccount.promise))
) {
this.tryToAppSwitch()
}
} catch (sendError) {
this.events.emit(BeaconEvent.INTERNAL_ERROR, {
text: 'Unable to send message. If this problem persists, please reset the connection and pair your wallet again.',
buttons: [
{
text: 'Reset Connection',
actionCallback: async (): Promise<void> => {
await closeToast()
this.disconnect()
}
}
]
})
throw sendError

try {
;(await this.transport).send(payload, peer)
if (
request.type !== BeaconMessageType.PermissionRequest ||
(this._activeAccount.isResolved() && (await this._activeAccount.promise))
) {
this.tryToAppSwitch()
}
} else {
this.pairingResponse = undefined
} catch (sendError) {
this.events.emit(BeaconEvent.INTERNAL_ERROR, {
text: 'Unable to send message. If this problem persists, please reset the connection and pair your wallet again.',
buttons: [
{
text: 'Reset Connection',
actionCallback: async (): Promise<void> => {
await closeToast()
this.disconnect()
}
}
]
})
throw sendError
}

if (!otherTabMessageId) {
Expand Down
4 changes: 2 additions & 2 deletions packages/beacon-transport-walletconnect/src/WalletConnectTransport.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export class WalletConnectTransport<
) {
super(
name,
WalletConnectCommunicationClient.getInstance(wcOptions),
WalletConnectCommunicationClient.getInstance(wcOptions, isLeader),
new PeerManager<K>(storage, storageKey)
)
}
Expand Down Expand Up @@ -89,7 +89,7 @@ export class WalletConnectTransport<
}

public async getPeers(): Promise<T[]> {
const client = WalletConnectCommunicationClient.getInstance(this.wcOptions)
const client = WalletConnectCommunicationClient.getInstance(this.wcOptions, this.isLeader)
const session = client.currentSession()
if (!session) {
return []
Expand Down
23 changes: 17 additions & 6 deletions ...acon-transport-walletconnect/src/communication-client/WalletConnectCommunicationClient.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,16 +111,22 @@ export class WalletConnectCommunicationClient extends CommunicationClient {
*/
private messageIds: string[] = []

constructor(private wcOptions: { network: NetworkType; opts: SignClientTypes.Options }) {
constructor(
private wcOptions: { network: NetworkType; opts: SignClientTypes.Options },
private isLeader: () => Promise<boolean>
) {
super()
}

static getInstance(wcOptions: {
network: NetworkType
opts: SignClientTypes.Options
}): WalletConnectCommunicationClient {
static getInstance(
wcOptions: {
network: NetworkType
opts: SignClientTypes.Options
},
isLeader: () => Promise<boolean>
): WalletConnectCommunicationClient {
if (!this.instance) {
this.instance = new WalletConnectCommunicationClient(wcOptions)
this.instance = new WalletConnectCommunicationClient(wcOptions, isLeader)
}
return WalletConnectCommunicationClient.instance
}
Expand Down Expand Up @@ -630,6 +636,11 @@ export class WalletConnectCommunicationClient extends CommunicationClient {
this.notifyListeners(_pairingTopic, errorResponse)
}
})
.then(() => {
if (!this.isMobileOS() && !this.isLeader()) {
this.clearState()
}
})

logger.warn('return uri and topic')

Expand Down

0 comments on commit 1809312

Please sign in to comment.