From d7f78c23b50218eaa52ab4570a1e2297c52c287e Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 18 Jul 2020 17:11:38 -0400
Subject: Script ready state change (#672)

* Update how backend/frontend ready states are awaited and signaled

* Log errors on the search page

* Update action name
---
 ext/mixed/js/yomichan.js | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

(limited to 'ext/mixed/js')

diff --git a/ext/mixed/js/yomichan.js b/ext/mixed/js/yomichan.js
index 3ae905c3..6eba68b2 100644
--- a/ext/mixed/js/yomichan.js
+++ b/ext/mixed/js/yomichan.js
@@ -51,15 +51,15 @@ const yomichan = (() => {
             this._isReady = false;
 
             const {promise, resolve} = deferPromise();
-            this._isBackendPreparedPromise = promise;
-            this._isBackendPreparedPromiseResolve = resolve;
+            this._isBackendReadyPromise = promise;
+            this._isBackendReadyPromiseResolve = resolve;
 
             this._messageHandlers = new Map([
-                ['isReady',         {async: false, handler: this._onMessageIsReady.bind(this)}],
-                ['backendPrepared', {async: false, handler: this._onMessageBackendPrepared.bind(this)}],
-                ['getUrl',          {async: false, handler: this._onMessageGetUrl.bind(this)}],
-                ['optionsUpdated',  {async: false, handler: this._onMessageOptionsUpdated.bind(this)}],
-                ['zoomChanged',     {async: false, handler: this._onMessageZoomChanged.bind(this)}]
+                ['isReady',        {async: false, handler: this._onMessageIsReady.bind(this)}],
+                ['backendReady',   {async: false, handler: this._onMessageBackendReady.bind(this)}],
+                ['getUrl',         {async: false, handler: this._onMessageGetUrl.bind(this)}],
+                ['optionsUpdated', {async: false, handler: this._onMessageOptionsUpdated.bind(this)}],
+                ['zoomChanged',    {async: false, handler: this._onMessageZoomChanged.bind(this)}]
             ]);
         }
 
@@ -73,10 +73,14 @@ const yomichan = (() => {
             chrome.runtime.onMessage.addListener(this._onMessage.bind(this));
         }
 
+        backendReady() {
+            this.sendMessage({action: 'requestBackendReadySignal'});
+            return this._isBackendReadyPromise;
+        }
+
         ready() {
             this._isReady = true;
-            this.sendMessage({action: 'yomichanCoreReady'});
-            return this._isBackendPreparedPromise;
+            this.sendMessage({action: 'yomichanReady'});
         }
 
         generateId(length) {
@@ -275,10 +279,10 @@ const yomichan = (() => {
             return this._isReady;
         }
 
-        _onMessageBackendPrepared() {
-            if (this._isBackendPreparedPromiseResolve === null) { return; }
-            this._isBackendPreparedPromiseResolve();
-            this._isBackendPreparedPromiseResolve = null;
+        _onMessageBackendReady() {
+            if (this._isBackendReadyPromiseResolve === null) { return; }
+            this._isBackendReadyPromiseResolve();
+            this._isBackendReadyPromiseResolve = null;
         }
 
         _onMessageGetUrl() {
-- 
cgit v1.2.3