From 3c335e68cdd41860d791ffe85dd07abf8932d3ce Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 12 Apr 2020 12:43:24 -0400
Subject: Throw errors in returned by invocation

---
 ext/bg/js/anki.js | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'ext/bg')

diff --git a/ext/bg/js/anki.js b/ext/bg/js/anki.js
index 27590311..c07af462 100644
--- a/ext/bg/js/anki.js
+++ b/ext/bg/js/anki.js
@@ -81,7 +81,7 @@ class AnkiConnect {
 
     async storeMediaFile(filename, dataBase64) {
         if (!this._enabled) {
-            return {result: null, error: 'AnkiConnect not enabled'};
+            throw new Error('AnkiConnect not enabled');
         }
         await this._checkVersion();
         return await this._ankiInvoke('storeMediaFile', {filename, data: dataBase64});
@@ -110,8 +110,19 @@ class AnkiConnect {
         }
     }
 
-    _ankiInvoke(action, params) {
-        return requestJson(this._server, 'POST', {action, params, version: this._localVersion});
+    async _ankiInvoke(action, params) {
+        const result = await requestJson(this._server, 'POST', {action, params, version: this._localVersion});
+        if (
+            result !== null &&
+            typeof result === 'object' &&
+            !Array.isArray(result)
+        ) {
+            const error = result.error;
+            if (typeof error !== 'undefined') {
+                throw new Error(`AnkiConnect error: ${error}`);
+            }
+        }
+        return result;
     }
 
     _escapeQuery(text) {
-- 
cgit v1.2.3