v2.1.1

tegon · Dec 28, 2019 · 91ec1d1 · 91ec1d1
2 parents f623149 + 020b138
commit 91ec1d1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "traktflix",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "A Trakt.tv scrobbler for Netflix.",
   "author": "tegon",
   "private": true,

diff --git a/src/class/Request.js b/src/class/Request.js
@@ -7,6 +7,9 @@ class Request {
     if (!Shared.isBackgroundPage() && !options.url.match(location.host)) {
       try {
         const response = await browser.runtime.sendMessage({ type: `request`, options: JSON.stringify(options) });
+        if (response.error) {
+          throw response;
+        }
         options.success(response);
       } catch (error) {
         options.error(error.status, error.responseText, error.options);

diff --git a/src/modules/background/index.js b/src/modules/background/index.js
@@ -38,7 +38,7 @@ if (chrome && chrome.declarativeContent) {
 }
 
 browser.runtime.onMessage.addListener((request, sender) => {
-  return new Promise(async (resolve, reject) => {
+  return new Promise(async resolve => {
     switch (request.type) {
       case `getApiDefs`:
         // noinspection JSIgnoredPromiseFromCall
@@ -113,8 +113,9 @@ browser.runtime.onMessage.addListener((request, sender) => {
         try {
           const response = await Request.sendAndWait(options);
           resolve(response);
-        } catch (error) {
-          reject(error);
+        } catch (response) {
+          response.error = true;
+          resolve(response);
         }
         return;
       }