Skip to content
This repository was archived by the owner on Dec 11, 2019. It is now read-only.

don’t use sync ipc for publisher info #9472

Merged
merged 1 commit into from
Jun 29, 2017
Merged

don’t use sync ipc for publisher info #9472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 48 additions & 42 deletions app/extensions/brave/content/scripts/pageInformation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,56 +140,62 @@
if (!node) node = document.head.querySelector("link[rel='shortcut icon']")
if (node) results.faviconURL = node.getAttribute('href')

var pubinfo = chrome.ipcRenderer.sendSync('ledger-publisher', document.location.href)
if ((!pubinfo) || (!pubinfo.context) || (!pubinfo.rules)) return console.log('no pubinfo available')
var location = document.location.href
chrome.ipcRenderer.once('ledger-publisher-response-' + location, (e, pubinfo) => {
if (!pubinfo || !pubinfo.context || !pubinfo.rules) {
return console.log('no pubinfo available')
}

var context = pubinfo.context
var rules = pubinfo.rules
var context = pubinfo.context
var rules = pubinfo.rules

var i, publisher, rule
for (i = 0; i < rules.length; i++) {
rule = rules[i]
var i, publisher, rule
for (i = 0; i < rules.length; i++) {
rule = rules[i]

try {
if (!resolve(rule.condition, context)) continue
} catch (ex) {
console.log('error resolving rule at position #' + i + '\n' + ex.stack)
continue
}
try {
if (!resolve(rule.condition, context)) continue
} catch (ex) {
console.log('error resolving rule at position #' + i + '\n' + ex.stack)
continue
}

if (rule.publisher) {
context.node = document.body.querySelector(rule.publisher.selector)
publisher = resolve(rule.publisher.consequent, context)
} else {
delete context.node
publisher = rule.consequent ? resolve(rule.consequent, context) : rule.consequent
}
if (publisher === '') continue
if (rule.publisher) {
context.node = document.body.querySelector(rule.publisher.selector)
publisher = resolve(rule.publisher.consequent, context)
} else {
delete context.node
publisher = rule.consequent ? resolve(rule.consequent, context) : rule.consequent
}
if (publisher === '') continue

if (typeof publisher !== 'string') return console.log('NOT a string')
if (typeof publisher !== 'string') return console.log('NOT a string')

publisher.replace(new RegExp('^./+|./+$', 'g'), '')
publisher.replace(new RegExp('^./+|./+$', 'g'), '')

results.publisher = publisher
if (rule.faviconURL) {
context.node = document.body.querySelector(rule.faviconURL.selector)
results.faviconURL = resolve(rule.faviconURL.consequent, context)
results.publisher = publisher
if (rule.faviconURL) {
context.node = document.body.querySelector(rule.faviconURL.selector)
results.faviconURL = resolve(rule.faviconURL.consequent, context)
}
break
}
break
}

if (results.faviconURL) {
var prefix = (results.faviconURL.indexOf('//') === 0) ? document.location.protocol
: (results.faviconURL.indexOf('/') === 0) ? document.location.protocol + '//' + document.location.host
: (results.faviconURL.indexOf(':') === -1) ? document.location.protocol + '//' + document.location.host + '/'
: null
if (prefix) results.faviconURL = prefix + results.faviconURL
}
if (results.faviconURL) {
var prefix = (results.faviconURL.indexOf('//') === 0) ? document.location.protocol
: (results.faviconURL.indexOf('/') === 0) ? document.location.protocol + '//' + document.location.host
: (results.faviconURL.indexOf(':') === -1) ? document.location.protocol + '//' + document.location.host + '/'
: null
if (prefix) results.faviconURL = prefix + results.faviconURL
}

results.url = window.location.href
chrome.ipcRenderer.send('dispatch-action', JSON.stringify([{
location: window.location.href,
actionType: 'event-set-page-info',
pageInfo: results
}]))
})
var pubinfo = chrome.ipcRenderer.send('ledger-publisher', location)

results.url = window.location.href
chrome.ipcRenderer.send('dispatch-action', JSON.stringify([{
location: window.location.href,
actionType: 'event-set-page-info',
pageInfo: results
}]))
} catch (ex) { console.log(ex.toString() + '\n' + ex.stack) } })()
4 changes: 3 additions & 1 deletion app/ledger.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,9 @@ if (ipc) {
ctx.RLD = tldjs.getSubdomain(ctx.host)
ctx.QLD = ctx.RLD ? underscore.last(ctx.RLD.split('.')) : ''

event.returnValue = { context: ctx, rules: publisherInfo._internal.ruleset.cooked }
if (!event.sender.isDestroyed()) {
event.sender.send(messages.LEDGER_PUBLISHER_RESPONSE + '-' + location, { context: ctx, rules: publisherInfo._internal.ruleset.cooked })
}
})

ipc.on(messages.NOTIFICATION_RESPONSE, (e, message, buttonIndex) => {
Expand Down
1 change: 1 addition & 0 deletions js/constants/messages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ const messages = {
// Ledger
LEDGER_PAYMENTS_PRESENT: _,
LEDGER_PUBLISHER: _,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think you can remove this message and its handler in app/ledger.js

LEDGER_PUBLISHER_RESPONSE: _,
LEDGER_UPDATED: _,
LEDGER_CREATE_WALLET: _,
ADD_FUNDS_CLOSED: _,
Expand Down