Manifest3

chrome/app/html/app.html

@@ -9,7 +9,6 @@
   </div>
 <script type="text/javascript" src="../js/lib/beautify/1.7.4/beautify.min.js"></script>
 <script type="text/javascript" src="../js/lib/beautify/1.7.4/beautify-html.min.js"></script>
-<script type="text/javascript" src="../js/lib/browser-polyfill/0.2.1/browser-polyfill.min.js"></script>
 <script type="text/javascript" src="../js/build/app.js"></script>
 
 </body>

chrome/app/js/background.js

@@ -1,3 +1,4 @@
+/*
 let appTabIds = {};
 let orgVars = {};
 
@@ -40,20 +41,97 @@ browser.tabs.onRemoved.addListener((tabId, changeInfo, tab) => {
       .forEach(key => appTabIds[key] = undefined)
   }
 
+})*/
+
+let appTabNames = ['options_tab','app_tab']
+let appTabIds = {}
+
+function focusTab(tabId) {
+  return chrome.tabs.get(tabId).then((tab) => {
+    if (tab) chrome.tabs.update(tab.id, {
+      active: true
+    })
+    chrome.windows.getCurrent({}).then((currentWindow) => {
+      if (tab.windowId != currentWindow.id) {
+        chrome.windows.update(tab.windowId, {
+          focused: true
+        });
+      }
+    })
+  })}
+
+chrome.tabs.onRemoved.addListener((closedTabId, changeInfo, tab) => {
+  appTabNames.forEach(async (name) => {
+    const tabId = await chrome.storage.sync.get(name) 
+    console.log('closedTabId', closedTabId)
+    console.log('tabId', tabId)
+    if(closedTabId == tabId){
+      chrome.storage.sync.set({
+        [name]: undefined
+      })
+    }
+  })
 })
 
-browser.runtime.onMessage.addListener((request) => {
+async function openOrFocusTab(url, name) {
+  const ids = await chrome.storage.sync.get(name) 
+  console.log('ids', ids)
+  console.log('name', name)
+  if (ids[name]) {
+    focusTab(ids[name]).catch((err) => openTab(url, name))
+  } else {
+    openTab(url, name)
+  }
+}
+
+function openTab(url, name) {
+  chrome.tabs.create({
+    'url': url,
+    'selected': true
+  }, function(tab) {
+    console.log('tab', tab)
+    chrome.storage.sync.set({
+      [name]: tab.id
+    })
+  });
+}
+
+chrome.action.onClicked.addListener(
+  () => openOrFocusTab(chrome.runtime.getURL('html/options.html'), "options_tab"))
+
+chrome.runtime.onMessage.addListener((request,sender,sendResponse) => {
+  console.log('request', request)
+  console.log('sender', sender)
   switch (request.command) {
+    case "getToken":
+      chrome.storage.local.get('token').then(function({
+        token
+      }) {
+        sendResponse({
+          token
+        })
+      })
+      break
+    case "getShortcuts":
+      chrome.storage.sync.get('shortcuts').then(function({
+        shortcuts
+      }) {
+        sendResponse({
+          shortcuts
+        })
+      })
+      break
     case "openTab":
-      browser.tabs.create({
+      chrome.tabs.create({
         url: request.url
       })
       break
     case "openOrFocusTab":
       openOrFocusTab(request.url, request.name)
       break
     case "focusAppTab":
-      const appTabNames = Object.keys(appTabIds).filter(tabName => tabName.startsWith("app_") )
+      // const appTabNames = Object.keys(appTabIds).filter(tabName => tabName.startsWith("app_") )
+      const appTabNames = []
       if(appTabNames.length > 0 && appTabIds[appTabNames[0]]){
         focusTab(appTabIds[appTabNames[0]])
         return true
@@ -74,7 +152,7 @@ browser.runtime.onMessage.addListener((request) => {
         console.log(orgVars)
         const tabId = appTabIds[ `app_${vars.oid}` ]
         if(tabId){
-          browser.tabs.sendMessage(tabId, request)
+          chrome.tabs.sendMessage(tabId, request)
         }
       }
       break;
@@ -84,4 +162,3 @@ browser.runtime.onMessage.addListener((request) => {
   }
   return true
 });
-

chrome/app/js/build/.gitignore

@@ -1,4 +1,3 @@
 # Ignore everything in this directory
-*
 # Except this file
 !.gitignore

chrome/app/js/options.js

@@ -13,15 +13,15 @@ function onload() {
   $i('new_btn').addEventListener('click', (event) => {
     shortcutsTable.appendChild(newShortcutLine())
   })
-  browser.storage.local.get('token').then(function({
+  chrome.storage.local.get('token').then(function({
     token
   }) {
     if (token) {
       const tokenElement = document.querySelector('.token_val')
       tokenElement.value = token
     }
   });
-  browser.storage.sync.get('shortcuts').then(function({
+  chrome.storage.sync.get('shortcuts').then(function({
     shortcuts
   }) {
     const shortcutLines = buildShortcuts(shortcuts)
@@ -117,12 +117,10 @@ function save(event) {
   const shortcuts = [...document.getElementById('shortcutsTable').children]
   const tokenElement = document.querySelector('.token_val')
   const token = tokenElement ? tokenElement.value : null;
-  if(token){
-    browser.storage.local.set({
+    chrome.storage.local.set({
       'token': token
     })
-  }
-  browser.storage.sync.set({
+  chrome.storage.sync.set({
     'shortcuts': shortcuts.map(toSetting).filter(x => x)
   })
 }