From 6ac2cf7b7568223d1e06a738d558032246f0e415 Mon Sep 17 00:00:00 2001
From: Dmitry Magalyas <dmitry.magalyas@gmail.com>
Date: Mon, 13 Feb 2023 19:14:21 +0100
Subject: [PATCH] ui fixes and sw updates

---
 .eslintrc.js                              |  1 +
 CHANGELOG.md                              |  3 +++
 package.json                              |  2 +-
 src/components/bookmark/BookmarkTools.vue | 10 +++++-----
 src/extension/content.js                  | 11 ++++++++++-
 src/extension/sw.js                       | 22 ++++++++++++++++++++++
 src/manifest.development.json             |  2 +-
 src/manifest.production.json              |  2 +-
 8 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 75e0c22..ed357c2 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -20,6 +20,7 @@ module.exports = {
     'max-len': 'off',
     'no-restricted-syntax': ['error', 'ForInStatement', 'LabeledStatement', 'WithStatement'],
     'no-use-before-define': ['error', { functions: false }],
+    'no-param-reassign': ['error', { props: false }],
   },
   overrides: [
     {
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a1d8c3..13f9182 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Change Log
 
+### v1.1.1
+- UI fixes 
+- SW improvements
 
 ### v1.1.0
 - a green icon is shown when a bookmark has already been created
diff --git a/package.json b/package.json
index 11a9b11..4699720 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "favbox",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
diff --git a/src/components/bookmark/BookmarkTools.vue b/src/components/bookmark/BookmarkTools.vue
index 57bcc32..4a7f942 100644
--- a/src/components/bookmark/BookmarkTools.vue
+++ b/src/components/bookmark/BookmarkTools.vue
@@ -13,11 +13,11 @@
             <Tab v-slot="{ selected }" as="template">
               <button
                 :class="[
-                  'w-full rounded-lg py-1 text-sm font-medium leading-5 text-gray-700',
+                  'w-full rounded-lg py-1 text-sm font-medium leading-5 text-gray-500',
                   ' focus:outline-none ',
                   selected
-                     ? 'bg-white shadow dark:bg-neutral-900 dark:text-neutral-400'
-                    : 'text-gray-500 hover:bg-white/[0.12] hover:text-gray-700',
+                    ? 'bg-white shadow dark:bg-neutral-900 dark:text-white'
+                    : 'text-gray-500 dark:text-white hover:bg-white/[0.12] hover:text-gray-700',
                 ]"
               >
                 Preview page
@@ -26,11 +26,11 @@
             <Tab v-slot="{ selected }" as="template">
               <button
                 :class="[
-                  'w-full rounded-lg py-1 text-sm font-medium leading-5 text-gray-700',
+                  'w-full rounded-lg py-1 text-sm font-medium leading-5 text-gray-500',
                   'focus:outline-none ',
                   selected
                     ? 'bg-white shadow dark:bg-neutral-900 dark:text-white'
-                    : 'text-gray-500 hover:bg-white/[0.12] hover:text-gray-700',
+                    : 'text-gray-500 dark:text-white hover:bg-white/[0.12] hover:text-gray-700',
                 ]"
               >
                 Edit bookmark
diff --git a/src/extension/content.js b/src/extension/content.js
index 41d32db..e92be00 100644
--- a/src/extension/content.js
+++ b/src/extension/content.js
@@ -1,9 +1,18 @@
 import Parser from '@/libs/parser';
 
+let port;
+function connect() {
+  port = chrome.runtime.connect({ name: 'favbox' });
+  port.onDisconnect.addListener(connect);
+  port.onMessage.addListener((msg) => {
+    console.log('received', msg, 'from bg');
+  });
+}
 try {
+  connect();
   const parser = new Parser(document.location.href, document);
   const pageInfo = parser.getFullPageInfo();
   await chrome.runtime.sendMessage({ action: 'cache', data: pageInfo });
 } catch (e) {
-  console.error('Caching error', e);
+  console.error('Content script error', e);
 }
diff --git a/src/extension/sw.js b/src/extension/sw.js
index b41405d..60c57a5 100644
--- a/src/extension/sw.js
+++ b/src/extension/sw.js
@@ -150,6 +150,28 @@ chrome.bookmarks.onRemoved.addListener(async (id, removeInfo) => {
   }
 });
 
+chrome.runtime.onConnect.addListener((port) => {
+  if (port.name !== 'favbox') return;
+  port.onMessage.addListener(onMessage);
+  port.onDisconnect.addListener(deleteTimer);
+  port.timer = setTimeout(forceReconnect, 150000, port);
+});
+
+function onMessage(msg, port) {
+  console.log('received', msg, 'from', port.sender);
+}
+function forceReconnect(port) {
+  console.warn('Reconnect...');
+  deleteTimer(port);
+  port.disconnect();
+}
+function deleteTimer(port) {
+  if (port.timer) {
+    clearTimeout(port.timer);
+    delete port.timer;
+  }
+}
+
 const storage = await chrome.storage.session.get('import');
 if (storage?.import !== true) {
   console.time('Execution time');
diff --git a/src/manifest.development.json b/src/manifest.development.json
index c72afbf..7516d1a 100644
--- a/src/manifest.development.json
+++ b/src/manifest.development.json
@@ -2,7 +2,7 @@
   "manifest_version": 3,
   "name": "FavBox",
   "description": "Clear and modern bookmarking tool.",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "permissions": ["bookmarks", "activeTab", "tabs", "storage"],
   "background": {
     "service_worker": "/sw.js"
diff --git a/src/manifest.production.json b/src/manifest.production.json
index c72afbf..7516d1a 100644
--- a/src/manifest.production.json
+++ b/src/manifest.production.json
@@ -2,7 +2,7 @@
   "manifest_version": 3,
   "name": "FavBox",
   "description": "Clear and modern bookmarking tool.",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "permissions": ["bookmarks", "activeTab", "tabs", "storage"],
   "background": {
     "service_worker": "/sw.js"