Manifest v3

src/bg/background.ts

@@ -19,112 +19,105 @@ import * as Sync from 'src/services/sync.bg'
 import * as Omnibox from 'src/services/omnibox.bg'
 import * as Styles from 'src/services/styles.bg'
 
-void (async function main() {
-  markLocalStorage()
-
-  Info.setInstanceType(E.InstanceType.bg)
-  IPC.setInstanceType(E.InstanceType.bg)
-  IPPC.setInstanceType(E.InstanceType.bg)
-  Logs.setInstanceType(E.InstanceType.bg)
-
-  const ts = performance.now()
-  Logs.info('Init start')
-
-  // Register globaly available actions
-  IPC.registerActions({
-    cacheTabsData: Tabs.cacheTabsData,
-    getGroupPageInitData: Tabs.getGroupPageInitData,
-    getPlaceholderPageInitData: Tabs.getPlaceholderPageInitData,
-    tabsApiProxy: Tabs.tabsApiProxy,
-    getSidebarTabs: Tabs.getSidebarTabs,
-    detachSidebarTabs: Tabs.detachSidebarTabs,
-    openTabs: Tabs.openTabs,
-    setActivePanelId: Sidebar.setActivePanelId,
-    createSnapshot: Snapshots.createSnapshot,
-    addSnapshot: Snapshots.addSnapshot,
-    removeSnapshot: Snapshots.removeSnapshot,
-    openSnapshotWindows: Snapshots.openWindows,
-    createWindowWithTabs: Windows.createWithTabs,
-    isWindowTabsLocked: Windows.isWindowTabsLocked,
-    saveFavicon: Favicons.saveFavicon,
-    reloadFavicons: Favicons.load,
-    saveInLocalStorage: Store.setFromRemoteFg,
-    checkIpInfo: WebReq.checkIpInfo,
-    disableAutoReopening: WebReq.disableAutoReopening,
-    enableAutoReopening: WebReq.enableAutoReopening,
-
-    saveToSync: Sync.save,
-    saveTabsToSync: Sync.saveTabs,
-    saveProfileInfoToGoogleSync: Sync.Google.saveProfileInfo,
-    removeFromSync: Sync.remove,
-    removeFromFirefoxSync: Sync.Firefox.remove,
-    removeByTypeFromSync: Sync.removeByType,
-    removeCachedIdFromGoogleSync: Sync.Google.removeCachedId,
-    getDataFromSync: Sync.getData,
-    loadSync: Sync.load,
-
-    getContainers: Containers.getContainers,
-    setContainers: Containers.setContainers,
-    createContainer: Containers.createAndSave,
-    removeContainer: Containers.removeAndSave,
-    importContainers: Containers.importContainers,
-  })
+markLocalStorage()
+
+Info.setInstanceType(E.InstanceType.bg)
+IPC.setInstanceType(E.InstanceType.bg)
+IPPC.setInstanceType(E.InstanceType.bg)
+Logs.setInstanceType(E.InstanceType.bg)
+
+const ts = performance.now()
+Logs.info('Init start')
+
+IPC.registerActions({
+  cacheTabsData: Tabs.cacheTabsData,
+  getGroupPageInitData: Tabs.getGroupPageInitData,
+  getPlaceholderPageInitData: Tabs.getPlaceholderPageInitData,
+  tabsApiProxy: Tabs.tabsApiProxy,
+  getSidebarTabs: Tabs.getSidebarTabs,
+  detachSidebarTabs: Tabs.detachSidebarTabs,
+  openTabs: Tabs.openTabs,
+  setActivePanelId: Sidebar.setActivePanelId,
+  createSnapshot: Snapshots.createSnapshot,
+  addSnapshot: Snapshots.addSnapshot,
+  removeSnapshot: Snapshots.removeSnapshot,
+  openSnapshotWindows: Snapshots.openWindows,
+  createWindowWithTabs: Windows.createWithTabs,
+  isWindowTabsLocked: Windows.isWindowTabsLocked,
+  saveFavicon: Favicons.saveFavicon,
+  reloadFavicons: Favicons.load,
+  saveInLocalStorage: Store.setFromRemoteFg,
+  checkIpInfo: WebReq.checkIpInfo,
+  disableAutoReopening: WebReq.disableAutoReopening,
+  enableAutoReopening: WebReq.enableAutoReopening,
+
+  saveToSync: Sync.save,
+  saveTabsToSync: Sync.saveTabs,
+  saveProfileInfoToGoogleSync: Sync.Google.saveProfileInfo,
+  removeFromSync: Sync.remove,
+  removeFromFirefoxSync: Sync.Firefox.remove,
+  removeByTypeFromSync: Sync.removeByType,
+  removeCachedIdFromGoogleSync: Sync.Google.removeCachedId,
+  getDataFromSync: Sync.getData,
+  loadSync: Sync.load,
+
+  getContainers: Containers.getContainers,
+  setContainers: Containers.setContainers,
+  createContainer: Containers.createAndSave,
+  removeContainer: Containers.removeAndSave,
+  importContainers: Containers.importContainers,
+})
+
+IPC.setupGlobalMessageListener()
+IPC.setupConnectionListener()
+Info.saveVersion()
+Windows.setupWindowsListeners()
+Settings.setupSettingsChangeListener()
+Sidebar.setupListeners()
+WebReq.updateReqHandlers()
+Tabs.setupListeners()
+Permissions.load()
+Permissions.setupListeners()
+Favicons.load()
+Menu.setupListeners()
+Snapshots.scheduleSnapshots()
+
+IPC.onConnected(E.InstanceType.sidebar, winId => {
+  Logs.info('IPC.onConnected sidebar', winId)
+
+  const tabs = Windows.byId.get(winId)?.tabs
+  if (tabs) Tabs.initInternalPageScripts(tabs)
+
+  if (Settings.state.markWindow && winId !== NOID) {
+    IPC.sendToSidebar(winId, 'updWindowPreface')
+  }
+})
+IPC.onDisconnected(E.InstanceType.sidebar, winId => {
+  Logs.info('IPC.onDisconnected sidebar', winId)
 
-  // Init first-need stuff
-  IPC.setupGlobalMessageListener()
-  IPC.setupConnectionListener()
-  await Promise.all([Windows.load(), Containers.load(), Settings.load(), Info.loadVersionInfo()])
+  if (Settings.state.markWindow && Windows.byId.has(winId)) {
+    browser.windows.update(winId, { titlePreface: '' })
+  }
+})
 
-  Info.saveVersion()
-  Windows.setupWindowsListeners()
-  Settings.setupSettingsChangeListener()
+initToolbarButton()
+Styles.load()
+Styles.setupListeners()
 
-  await Sidebar.load()
-  Sidebar.setupListeners()
+browser.runtime.onUpdateAvailable.addListener(details => {
+  const currentVersion = Info.versionToInt(browser.runtime.getManifest().version)
+  const newVersion = Info.versionToInt(details.version)
+  if (newVersion <= currentVersion) browser.runtime.reload()
+})
 
-  WebReq.updateReqHandlers()
+Omnibox.setupListeners()
+Omnibox.load()
 
-  Tabs.setupListeners()
+void (async function main() {
+  await Promise.all([Windows.load(), Containers.load(), Settings.load(), Info.loadVersionInfo()])
+  await Sidebar.load()
   await Tabs.load()
 
-  Permissions.load()
-  Permissions.setupListeners()
-  Favicons.load()
-  Menu.setupListeners()
-  Snapshots.scheduleSnapshots()
-
-  // Update title preface on sidebar connection/disconnection
-  IPC.onConnected(E.InstanceType.sidebar, winId => {
-    Logs.info('IPC.onConnected sidebar', winId)
-
-    const tabs = Windows.byId.get(winId)?.tabs
-    if (tabs) Tabs.initInternalPageScripts(tabs)
-
-    if (Settings.state.markWindow && winId !== NOID) {
-      IPC.sendToSidebar(winId, 'updWindowPreface')
-    }
-  })
-  IPC.onDisconnected(E.InstanceType.sidebar, winId => {
-    Logs.info('IPC.onDisconnected sidebar', winId)
-
-    if (Settings.state.markWindow && Windows.byId.has(winId)) {
-      browser.windows.update(winId, { titlePreface: '' })
-    }
-  })
-
-  initToolbarButton()
-  Styles.load()
-  Styles.setupListeners()
-
-  browser.runtime.onUpdateAvailable.addListener(details => {
-    const currentVersion = Info.versionToInt(browser.runtime.getManifest().version)
-    const newVersion = Info.versionToInt(details.version)
-    if (newVersion <= currentVersion) browser.runtime.reload()
-  })
-
-  Omnibox.setupListeners()
-  Omnibox.load()
-
   Logs.info(`Init end: ${performance.now() - ts}ms`)
 
   window.getSideberyState = () => {
@@ -144,7 +137,7 @@ void (async function main() {
 function initToolbarButton(): void {
   Menu.createBrowserActionMenu()
 
-  browser.browserAction.onClicked.addListener((_, info): void => {
+  browser.action.onClicked.addListener((_, info): void => {
     if (info && info.button === 1) browser.runtime.openOptionsPage()
     else browser.sidebarAction.toggle()
   })

src/manifest.json

@@ -1,5 +1,5 @@
 {
-  "manifest_version": 2,
+  "manifest_version": 3,
   "browser_specific_settings": {
     "gecko": {
       "id": "{3c078156-979c-498b-8990-85f7987dd929}",
@@ -37,14 +37,14 @@
     "storage",
     "unlimitedStorage",
     "sessions",
+    "scripting",
     "menus",
     "menus.overrideContext",
     "search",
     "theme",
     "identity"
   ],
   "optional_permissions": [
-    "<all_urls>",
     "proxy",
     "webRequest",
     "webRequestBlocking",
@@ -55,6 +55,9 @@
     "history",
     "downloads"
   ],
+  "host_permissions": [
+    "<all_urls>"
+  ],
   "sidebar_action": {
     "default_icon": "./assets/logo-native.svg",
     "default_title": "Sidebery",
@@ -483,7 +486,7 @@
       "description": "__MSG_KbOpenSyncPopup__"
     }
   },
-  "browser_action": {
+  "action": {
     "default_icon": "./assets/logo-native.svg",
     "default_title": "__MSG_ActionTitle__",
     "default_area": "navbar",

src/services/menu.bg.ts

@@ -12,27 +12,33 @@ export function createSettingsMenu(): void {
     id: 'open_settings',
     title: translate('menu.browserAction.open_settings'),
     icons: { '16': 'assets/logo-native.svg' },
-    onclick: () => browser.runtime.openOptionsPage(),
-    contexts: ['browser_action'],
+    contexts: ['action'],
   })
   browser.menus.create({
     id: 'create_snapshot',
     title: translate('menu.browserAction.create_snapshot'),
     icons: { '16': 'assets/snapshot-native.svg' },
-    onclick: () => SnapshotsBg.createSnapshot(),
-    contexts: ['browser_action'],
+    contexts: ['action'],
   })
 }
 
+function onMenuClicked(info: browser.menus.OnClickData): void {
+  if (info.menuItemId === 'open_settings') browser.runtime.openOptionsPage()
+  else if (info.menuItemId === 'create_snapshot') SnapshotsBg.createSnapshot()
+  else TabsBg.openCachedWindowFromMenu(info.menuItemId)
+}
+
 function onMenuHiddenBg(): void {
   browser.menus.removeAll()
   createBrowserActionMenu()
 }
 
 export function setupListeners(): void {
   browser.menus.onHidden.addListener(onMenuHiddenBg)
+  browser.menus.onClicked.addListener(onMenuClicked)
 }
 
 export function resetListeners(): void {
   browser.menus.onHidden.removeListener(onMenuHiddenBg)
+  browser.menus.onClicked.removeListener(onMenuClicked)
 }

src/services/search.fg.ts

@@ -499,12 +499,12 @@ export function start(): void {
 
   const hasFocus = document.hasFocus()
   if (!hasFocus) {
-    browser.browserAction.setPopup({ popup: SEARCH_URL })
-    browser.browserAction.openPopup()
+    browser.action.setPopup({ popup: SEARCH_URL })
+    browser.action.openPopup()
     Search.reactive.popupIsShowed = true
 
     // Reset browser action
-    setTimeout(() => browser.browserAction.setPopup({ popup: null }), 500)
+    setTimeout(() => browser.action.setPopup({ popup: null }), 500)
   }
 
   showBar()

src/services/tabs.bg.ts

@@ -109,8 +109,7 @@ export function createOpenFromCacheMenu() {
       id: 'reopen_cached_win',
       title: translate('menu.browserAction.reopen_cached_win_first', winCache.length),
       icons: { '16': 'assets/window-native.svg' },
-      onclick: () => openCachedWindow(winCache),
-      contexts: ['browser_action'],
+      contexts: ['action'],
     })
   }
 
@@ -120,7 +119,7 @@ export function createOpenFromCacheMenu() {
       id: 'reopen_cached_wins',
       title: translate('menu.browserAction.reopen_cached_wins'),
       icons: { '16': 'assets/window-native.svg' },
-      contexts: ['browser_action'],
+      contexts: ['action'],
     })
 
     for (let i = 0; i < _tabsDataCache.length; i++) {
@@ -137,13 +136,26 @@ export function createOpenFromCacheMenu() {
         parentId,
         title: translate('menu.browserAction.reopen_cached_win', winCache.length, panelIds.size),
         icons: { '16': 'assets/window-native.svg' },
-        onclick: () => openCachedWindow(winCache),
-        contexts: ['browser_action'],
+        contexts: ['action'],
       })
     }
   }
 }
 
+export function openCachedWindowFromMenu(menuItemId: string): void {
+  if (!_tabsDataCache) return
+  if (menuItemId === 'reopen_cached_win') {
+    const winCache = _tabsDataCache[0]
+    if (winCache) openCachedWindow(winCache)
+    return
+  }
+
+  const index = Number(menuItemId.match(/^reopen_cached_win_(\d+)$/)?.[1])
+  if (!Number.isInteger(index)) return
+  const winCache = _tabsDataCache[index]
+  if (winCache) openCachedWindow(winCache)
+}
+
 function openCachedWindow(cache: T.TabCache[]) {
   const items: T.ItemInfo[] = []
   for (const cachedTab of cache) {

src/services/tabs.fg.edit-title.ts

@@ -107,11 +107,11 @@ function openEditingPopup(value: string, placeholder?: string) {
   url.searchParams.set('winId', Windows.id.toString())
   url.searchParams.set('value', value)
   if (placeholder) url.searchParams.set('placeholder', placeholder)
-  browser.browserAction.setPopup({ popup: url.toString() })
-  browser.browserAction.openPopup()
+  browser.action.setPopup({ popup: url.toString() })
+  browser.action.openPopup()
 
   // Reset browser action
-  setTimeout(() => browser.browserAction.setPopup({ popup: null }), 500)
+  setTimeout(() => browser.action.setPopup({ popup: null }), 500)
 }
 
 export function getEditingValue() {