From ce827efb05b64087e7f084d0e2cc0d1ef6414cf3 Mon Sep 17 00:00:00 2001
From: Kevin Gibbons <bakkot@gmail.com>
Date: Sat, 11 Feb 2023 16:42:57 -0800
Subject: [PATCH] move logic into background.js

---
 extension/background.js | 12 +++++++++---
 extension/popup.js      | 11 ++---------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/extension/background.js b/extension/background.js
index 9ee6dbd..fda5825 100644
--- a/extension/background.js
+++ b/extension/background.js
@@ -87,10 +87,16 @@ async function getCookieState() {
 // send ping to server, return response
 async function verifyConnection() {
   const path = 'api/ping/';
-  let response = await sendGet(path);
-  console.log('verify connection: ' + JSON.stringify(response));
+  let message = await sendGet(path);
+  console.log('verify connection: ' + JSON.stringify(message));
 
-  return response;
+  if (message?.response === 'pong') {
+    return true;
+  } else if (message?.detail) {
+    throw new Error(message.detail);
+  } else {
+    throw new Error(`got unknown message ${JSON.stringify(message)}`);
+  }
 }
 
 // send youtube link from injected buttons
diff --git a/extension/popup.js b/extension/popup.js
index 2956cec..68fc3fc 100644
--- a/extension/popup.js
+++ b/extension/popup.js
@@ -103,15 +103,8 @@ function sendCookie() {
 function pingBackend() {
   clearError();
   function handleResponse(message) {
-    // TODO move this check into background.js
-    if (message?.response === 'pong') {
-      setStatusIcon(true);
-      console.log('connection validated');
-    } else if (message?.detail) {
-      handleError(message.detail);
-    } else {
-      handleError(`got unknown message ${JSON.stringify(message)}`);
-    }
+    console.log('connection validated');
+    setStatusIcon(true);
   }
 
   function handleError(error) {