From 920eee88beb1ac946832f76358f6613776bfc00e Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Mon, 28 Jan 2019 16:16:52 -0500
Subject: [PATCH] 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).
---
 platform/chromium/vapi-client.js | 37 ++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 14 deletions(-)

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