Add alerta about backend's status

censortracker · Aug 17, 2022 · 1499405 · 1499405
1 parent 8724b78
commit 1499405
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 4 deletions.
diff --git a/src/shared/_locales/en/messages.json b/src/shared/_locales/en/messages.json
@@ -392,5 +392,14 @@
   },
   "youCanCloseThisWindow": {
     "message": "You can close this window"
+  },
+  "backendIsIntermittentTitle": {
+    "message": "The backend service is intermittent right now."
+  },
+  "backendIsIntermittentDesc": {
+    "message": "Censor Tracker will use the fallback configuration until the backend service is alive."
+  },
+  "popupBackedStatusError": {
+    "message": "the backend service is intermittent"
   }
-}
+}
diff --git a/src/shared/_locales/ru/messages.json b/src/shared/_locales/ru/messages.json
@@ -392,5 +392,14 @@
   },
   "youCanCloseThisWindow": {
     "message": "Можно закрыть это окно"
+  },
+  "backendIsIntermittentTitle": {
+    "message": "Серверная служба сейчас работает с перебоями."
+  },
+  "backendIsIntermittentDesc": {
+    "message": "Censor Tracker будет использовать резервную конфигурацию до тех пор, пока серверная служба не заработает."
+  },
+  "popupBackedStatusError": {
+    "message": "серверная служба работают с перебоями"
   }
-}
+}
diff --git a/src/shared/js/background/registry.js b/src/shared/js/background/registry.js
@@ -85,14 +85,17 @@ class Registry {
           })
         }
 
+        await storage.set({ backendIsIntermittent: false })
         return {
           apis,
           countryDetails,
         }
       }
       console.error('Backend is intermittent: using fallback config.')
+      await storage.set({ backendIsIntermittent: true })
       return fallbackConfig
     } catch (error) {
+      await storage.set({ backendIsIntermittent: true })
       console.error('Backend is intermittent: using fallback config.')
       return fallbackConfig
     }

diff --git a/src/shared/js/pages/options.js b/src/shared/js/pages/options.js
@@ -28,6 +28,12 @@ import Browser from 'Background/webextension';
   const optionsRegistryProxyingListButton = document.getElementById(
     'optionsRegistryProxyingListButton',
   )
+  const backendIsIntermittentAlert = document.getElementById('backendIsIntermittentAlert')
+
+  storage.get('backendIsIntermittent')
+    .then(({ backendIsIntermittent = false }) => {
+      backendIsIntermittentAlert.hidden = !backendIsIntermittent
+    })
 
   Registry.isEmpty().then((isEmpty) => {
     if (isEmpty) {

diff --git a/src/shared/js/pages/popup.js b/src/shared/js/pages/popup.js
@@ -47,6 +47,7 @@ import Browser from 'Background/webextension';
   const popupProxyStatusOk = document.getElementById('popupProxyStatusOk')
   const popupProxyDisabled = document.getElementById('popupProxyDisabled')
   const popupProxyStatusError = document.getElementById('popupProxyStatusError')
+  const popupBackedStatusError = document.getElementById('popupBackedStatusError')
   const footerExtensionIsOn = document.getElementById('footerExtensionIsOn')
   const currentDomainHeader = document.getElementById('currentDomainHeader')
   const closeDetailsButtons = document.querySelectorAll('.btn-hide-details')
@@ -66,6 +67,11 @@ import Browser from 'Background/webextension';
   const proxyingEnabled = await ProxyManager.isEnabled()
   const extensionEnabled = await Settings.extensionEnabled()
 
+  storage.get('backendIsIntermittent')
+    .then(({ backendIsIntermittent = false }) => {
+      popupBackedStatusError.hidden = !backendIsIntermittent
+    })
+
   ProxyManager.alive().then((alive) => {
     if (proxyingEnabled) {
       if (alive) {

diff --git a/src/shared/pages/options.html b/src/shared/pages/options.html
@@ -25,6 +25,11 @@
         <div class="block__title" data-i18n-key="censorshipCircumventionBlockTitle"></div>
         <div class="options-hr"></div>
 
+        <div id="backendIsIntermittentAlert" hidden class="proxy__disclaimer">
+          <div data-i18n-key="backendIsIntermittentTitle" class="disclaimer__title"></div>
+          <div data-i18n-key="backendIsIntermittentDesc" class="disclaimer__text"></div>
+        </div>
+
         <div class="checkbox__group" id="proxyOptionsGroup">
           <a id="proxyOptionsButton" href="proxy-options.html" class="main-page__link link-ignored">
             <span data-i18n-key="proxySettings"></span>
@@ -67,8 +72,10 @@
         <div class="main-page__extension hidden" id="optionsRegistryIsEmptyWarning">
           <div class="extension__title" data-i18n-key="optionsRegistryIsEmptyTitle"></div>
           <div class="extension__text" data-i18n-key="optionsRegistryIsEmptyDesc"></div>
-          <a class="default-btn" id="optionsRegistryUpdateDatabaseButton" data-i18n-key="optionsRegistryUpdateDatabaseButton"></a>
-          <a class="default-btn" id="optionsRegistryProxyingListButton" data-i18n-key="optionsRegistryProxyingListButton"></a>
+          <a class="default-btn" id="optionsRegistryUpdateDatabaseButton"
+             data-i18n-key="optionsRegistryUpdateDatabaseButton"></a>
+          <a class="default-btn" id="optionsRegistryProxyingListButton"
+             data-i18n-key="optionsRegistryProxyingListButton"></a>
         </div>
 
         <div class="checkbox__group" id="proxiedWebsitesEditor">

diff --git a/src/shared/pages/popup.html b/src/shared/pages/popup.html
@@ -96,6 +96,7 @@
         </div>
         <div id="popupProxyStatusOk" data-i18n-key="popupProxyStatusOk" class="censor-tracker__status" hidden></div>
         <div id="popupProxyStatusError" data-i18n-key="popupProxyStatusError" class="censor-tracker__status status-error" hidden></div>
+        <div id="popupBackedStatusError" data-i18n-key="popupBackedStatusError" class="censor-tracker__status status-error" hidden></div>
         <div id="popupProxyDisabled" data-i18n-key="popupProxyDisabled" class="censor-tracker__status" hidden></div>
       </div>
       <div class="censor-tracker__column">