Refactor

- Add `chrome-extension-async`
- Add `src/libs`
- Add `lastFocusedWindowId` to record lst focused window
- FIx debug popup issue

Author: xcv58

package.json

@@ -13,6 +13,7 @@
     "test": "yarn lint && yarn build"
   },
   "dependencies": {
+    "chrome-extension-async": "^3.2.4",
     "jquery": "^3.2.1",
     "mobx": "^3.3.1",
     "mobx-react": "^4.3.3",

src/js/background.js

@@ -1,14 +1,16 @@
+import 'chrome-extension-async'
+import { getActiveTab, setLastFocusedWindowId } from 'libs'
+
 const getURL = ({ url }) => new window.URL(url)
 
 const reloadTab = (tab) => chrome.tabs.reload(tab.id)
 
 const methodMap = {
-  getData: (message, { url }, sendResponse) => {
+  getData: async (message, { url }, sendResponse) => {
     const { host, protocol, origin } = url
-    chrome.storage.sync.get(origin, (data) => {
-      const customjs = data[origin]
-      sendResponse({ customjs, host, protocol })
-    })
+    const data = await chrome.store.sync.get(origin)
+    const customjs = data[origin]
+    sendResponse({ customjs, host, protocol })
   },
   setData: (message, { url }) => chrome.storage.sync.set(
     { [url.origin]: message.customjs }
@@ -17,32 +19,34 @@ const methodMap = {
   goTo: (message, { tab }) => chrome.tabs.update(tab.id, { url: message.link })
 }
 
-const onMessage = (message, sender, sendResponse) => chrome.tabs.query(
-  { active: true, currentWindow: true },
-  (tabs) => {
-    if (tabs.length <= 0) {
-      // TODO: handle this in UI
-      throw new Error('No active tab! This is impossible')
-    }
-    const [ tab ] = tabs
-    const url = getURL(tab)
-    const { method, reload } = message
-
-    const func = methodMap[method]
-    if (func && typeof func === 'function') {
-      func(message, { tab, url }, sendResponse)
-    } else {
-      console.error(`Unknown method: ${method}`)
-      sendResponse({ src: '', config: {} })
-    }
-
-    if (reload) {
-      reloadTab(tab)
-    }
+const onMessage = async (message, sender, sendResponse) => {
+  const tab = await getActiveTab()
+  const url = getURL(tab)
+  const { method, reload } = message
+
+  const func = methodMap[method]
+  if (func && typeof func === 'function') {
+    func(message, { tab, url }, sendResponse)
+  } else {
+    console.error(`Unknown method: ${method}`)
+    sendResponse({ src: '', config: {} })
   }
-)
+
+  if (reload) {
+    reloadTab(tab)
+  }
+}
+
+const onFocusChanged = (windowId) => {
+  if (windowId < 0) {
+    return
+  }
+  setLastFocusedWindowId(windowId)
+}
 
 chrome.runtime.onMessage.addListener((...args) => {
   onMessage(...args)
   return true
 })
+
+chrome.windows.onFocusChanged.addListener(onFocusChanged)

src/js/libs/index.js

@@ -0,0 +1,26 @@
+export const setLastFocusedWindowId = (lastFocusedWindowId) => {
+  chrome.storage.local.set({ lastFocusedWindowId })
+}
+
+export const getLastFocusedWindowId = async () => {
+  const { lastFocusedWindowId } = await chrome.storage.local.get({ lastFocusedWindowId: null })
+  return lastFocusedWindowId
+}
+
+const getQueryInfo = (windowId) => {
+  if (windowId) {
+    return { windowId }
+  }
+  return { currentWindow: true }
+}
+
+export const getActiveTab = async () => {
+  const windowId = await getLastFocusedWindowId()
+  const queryInfo = getQueryInfo(windowId)
+  const tabs = await chrome.tabs.query({ ...queryInfo, active: true })
+  if (tabs.length <= 0) {
+    // TODO: handle this in UI
+    throw new Error('No active tab! This is impossible')
+  }
+  return tabs[0]
+}

yarn.lock

@@ -1273,6 +1273,10 @@ chownr@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
 
+chrome-extension-async@^3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/chrome-extension-async/-/chrome-extension-async-3.2.4.tgz#c5b3e206688ca81c903b5e239ff3f9a73a29c47e"
+
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"