From 9d64e9ba54f9a4ebc0cb9e7afb7f19d983dd6ca5 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Sat, 19 Feb 2022 08:46:24 +0300
Subject: [PATCH] wait for real prefs on bg startup

+ convert msg.sendXXX to async
---
 background/background.js    |  2 +-
 background/common.js        |  2 +-
 background/style-manager.js |  2 +-
 js/msg.js                   | 25 +++++++++++--------------
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/background/background.js b/background/background.js
index 0ca81b4a..c3880247 100644
--- a/background/background.js
+++ b/background/background.js
@@ -222,6 +222,6 @@ Promise.all([
     require(['/background/context-menus']),
 ]).then(() => {
   bgReady._resolveAll();
-  msg.isBgReady = true;
+  msg.ready = true;
   msg.broadcast({method: 'backgroundReady'});
 });
diff --git a/background/common.js b/background/common.js
index ef1c0ffd..5fe9c7f7 100644
--- a/background/common.js
+++ b/background/common.js
@@ -5,7 +5,7 @@
  * Common stuff that's loaded first so it's immediately available to all background scripts
  */
 
-const bgReady = {};
+window.bgReady = {}; /* global bgReady */
 bgReady.styles = new Promise(r => (bgReady._resolveStyles = r));
 bgReady.all = new Promise(r => (bgReady._resolveAll = r));
 
diff --git a/background/style-manager.js b/background/style-manager.js
index a4094c40..4fc44024 100644
--- a/background/style-manager.js
+++ b/background/style-manager.js
@@ -75,7 +75,7 @@ const styleMan = (() => {
   };
   uuidIndex.addCustomId(orderWrap, {set: setOrder});
   /** @type {Promise|boolean} will be `true` to avoid wasting a microtask tick on each `await` */
-  let ready = init();
+  let ready = Promise.all([init(), prefs.ready]);
 
   chrome.runtime.onConnect.addListener(port => {
     if (port.name === 'livePreview') {
diff --git a/js/msg.js b/js/msg.js
index 5b1ae7b1..5571d420 100644
--- a/js/msg.js
+++ b/js/msg.js
@@ -16,6 +16,8 @@
   ];
   const ERR_NO_RECEIVER = 'Receiving end does not exist';
   const ERR_PORT_CLOSED = 'The message port closed before';
+  const NULL_RESPONSE = {error: {message: ERR_NO_RECEIVER}};
+  const STACK = 'Callstack before invoking msg.';
   const handler = {
     both: new Set(),
     tab: new Set(),
@@ -76,14 +78,14 @@
       }
     },
 
-    send(data, target = 'extension') {
-      return browser.runtime.sendMessage({data, target})
-        .then(unwrapResponseFactory('send'));
+    async send(data, target = 'extension') {
+      const err = new Error(`${STACK}send:`); // Saving callstack prior to `await`
+      return unwrap(err, await browser.runtime.sendMessage({data, target}));
     },
 
-    sendTab(tabId, data, options, target = 'tab') {
-      return browser.tabs.sendMessage(tabId, {data, target}, options)
-        .then(unwrapResponseFactory('sendTab'));
+    async sendTab(tabId, data, options, target = 'tab') {
+      const err = new Error(`${STACK}sendTab:`); // Saving callstack prior to `await`
+      return unwrap(err, await browser.tabs.sendMessage(tabId, {data, target}, options));
     },
 
     _execute(types, ...args) {
@@ -113,7 +115,7 @@
   function getExtBg() {
     const fn = chrome.extension.getBackgroundPage;
     const bg = fn && fn();
-    return bg === window || bg && bg.msg && bg.msg.isBgReady ? bg : null;
+    return bg === window || bg && (bg.msg || {}).ready ? bg : null;
   }
 
   function onRuntimeMessage({data, target}, sender, sendResponse) {
@@ -138,12 +140,7 @@
     };
   }
 
-  function unwrapResponseFactory(name) {
-    // Saving the local callstack before making an async call
-    return unwrapResponse.bind(null, new Error(`Callstack before invoking msg.${name}:`));
-  }
-
-  function unwrapResponse(localErr, {data, error} = {error: {message: ERR_NO_RECEIVER}}) {
+  function unwrap(localErr, {data, error} = NULL_RESPONSE) {
     return error
       ? Promise.reject(Object.assign(localErr, error, error.stack && {
         stack: `${error.stack}\n${localErr.stack}`,
@@ -163,7 +160,7 @@
       const message = {method: 'invokeAPI', path, args};
       let res;
       // content scripts, probably private tabs, and our extension tab during Chrome startup
-      if (!bg) {
+      if (!bg || !bg.msg || !bg.msg.ready && await bg.bgReady.all && false) {
         res = msg.send(message);
       } else {
         res = deepMerge(await bg.msg._execute(TARGETS.extension, message, {