Skip to content

Commit 4e2bb3a

Browse files
committed
refactor: sendMessage
1 parent f9cc22c commit 4e2bb3a

File tree

1 file changed

+13
-20
lines changed

1 file changed

+13
-20
lines changed

packages/goto/src/adblock.js

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -55,38 +55,31 @@ const autoconsentConfig = Object.freeze({
5555
}
5656
})
5757

58-
const noop = () => {}
58+
const sendMessage = (page, message) =>
59+
page
60+
.evaluate(msg => {
61+
if (window.autoconsentReceiveMessage) {
62+
return window.autoconsentReceiveMessage(msg)
63+
}
64+
}, message)
65+
.catch(() => {})
5966

6067
const setupAutoConsent = async page => {
6168
if (page._autoconsentSetup) return
6269

63-
const onAutoConsentMessage = async message => {
70+
await page.exposeFunction('autoconsentSendMessage', async message => {
6471
if (!message || typeof message !== 'object') return
6572

6673
if (message.type === 'init') {
67-
await page
68-
.evaluate(config => {
69-
if (window.autoconsentReceiveMessage) {
70-
return window.autoconsentReceiveMessage({ type: 'initResp', config })
71-
}
72-
}, autoconsentConfig)
73-
.catch(noop)
74+
return sendMessage(page, { type: 'initResp', config: autoconsentConfig })
7475
}
7576

76-
if (message.type === 'eval' && message.id) {
77-
await page
78-
.evaluate(id => {
79-
if (window.autoconsentReceiveMessage) {
80-
return window.autoconsentReceiveMessage({ type: 'evalResp', id, result: false })
81-
}
82-
}, message.id)
83-
.catch(noop)
77+
if (message.type === 'eval') {
78+
return sendMessage(page, { type: 'evalResp', id: message.id, result: false })
8479
}
85-
}
80+
})
8681

87-
await page.exposeFunction('autoconsentSendMessage', onAutoConsentMessage)
8882
await page.evaluateOnNewDocument(autoconsentPlaywrightScript)
89-
9083
page._autoconsentSetup = true
9184
}
9285

0 commit comments

Comments
 (0)