Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Code review: ensure vAPI.shutdown.exec is called from root context only 

This prevents uncaught errors in content scripts when uBO's main
process is terminated (i.e. disabled, updated).
This commit is contained in:
Raymond Hill 2019-01-28 16:16:52 -05:00
parent a6ebcc85be
commit 920eee88be
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
platform/chromium/vapi-client.js
View File

@ -53,10 +53,15 @@ vAPI.shutdown = {
this.jobs.push(job); this.jobs.push(job);
}, },
exec: function() { exec: function() {
let job; // Shutdown asynchronously, to ensure shutdown jobs are called from
while ( (job = this.jobs.pop()) ) { // the top context.
job(); self.requestIdleCallback(( ) => {
} const jobs = this.jobs.slice();
this.jobs.length = 0;
while ( jobs.length !== 0 ) {
(jobs.pop())();
}
});
}, },
remove: function(job) { remove: function(job) {
let pos; let pos;
@ -238,16 +243,20 @@ vAPI.messaging = {
} catch (ex) { } catch (ex) {
this.port = null; this.port = null;
} }
if ( this.port !== null ) { // Not having a valid port at this point means the main process is
this.port.onMessage.addListener(this.messageListenerCallback); // not available: no point keeping the content scripts alive.
this.port.onDisconnect.addListener(this.disconnectListenerBound); if ( this.port === null ) {
this.portTimerDelay = 10000; vAPI.shutdown.exec();
if ( this.portTimer === null ) { return null;
this.portTimer = vAPI.setTimeout( }
this.portPollerBound, this.port.onMessage.addListener(this.messageListenerCallback);
this.portTimerDelay this.port.onDisconnect.addListener(this.disconnectListenerBound);
); this.portTimerDelay = 10000;
} if ( this.portTimer === null ) {
this.portTimer = vAPI.setTimeout(
this.portPollerBound,
this.portTimerDelay
);
} }
return this.port; return this.port;
}, },