feat: add sb omnibox handler, wire it up to reopening in container

Author: ErichDonGubler

src/bg/background.ts

@@ -1,4 +1,4 @@
-import { InstanceType } from 'src/types'
+import { Containers, InstanceType } from 'src/types'
 import { NOID } from 'src/defaults'
 import * as IPC from 'src/services/ipc'
 import * as Logs from 'src/services/logs'
@@ -116,6 +116,66 @@ void (async function main() {
     if (newVersion <= currentVersion) browser.runtime.reload()
   })
 
+  browser.omnibox.setDefaultSuggestion({ description: 'Type the name of the container you want for this tab…' })
+
+  function matchContainers(input: string): Container[] {
+    // TODO: order by score of some sort?
+    // TODO: At the very least, put an exact match first.
+    // TODO: Validate we want Sidebery records, not Firefox records.
+    return Object.values(Containers.reactive.byId).filter(container =>
+      container.name.toLowerCase().includes(input.toLowerCase())
+    )
+  }
+
+  browser.omnibox.onInputChanged.addListener(async (input, suggest) => {
+    const suggestions = matchContainers(input).map(ctx => ({
+      content: ctx.name,
+      description: ctx.name,
+      deletable: false,
+    }))
+    suggest(suggestions)
+  })
+
+  browser.omnibox.onInputEntered.addListener(async (input, _disposition) => {
+    // NOTE: We're semantically _re-opening_ tabs, which conflicts with a disposition. Ignore it.
+
+    if (!Windows.lastFocusedWinId) {
+      Logs.err('omnibox: no last focused window ID found')
+      return
+    }
+
+    const matchingContainers = matchContainers(input)
+    if (matchingContainers.length <= 0) {
+      Logs.warn('omnibox: no matching containers found')
+      return
+    }
+    const firstMatchingContainer = matchingContainers[0]
+
+    const sidebarTabs = await Tabs.getSidebarTabs(Windows.lastFocusedWinId)
+    if (!sidebarTabs) {
+      Logs.err('omnibox: no sidebar tabs found for last focused window ID')
+      return
+    }
+
+    const con = IPC.getConnection(InstanceType.sidebar, Windows.lastFocusedWinId)
+    if ((con?.localPort && con.localPort.error) || (con?.remotePort && con.remotePort.error)) {
+      Logs.err('need to fall back to creating tabs by hand')
+      return
+    }
+
+    const activeTabs = sidebarTabs.filter(tab => tab.active)
+    try {
+      await IPC.sidebar(
+        Windows.lastFocusedWinId,
+        'reopenInContainer',
+        activeTabs.map(tab => tab.id),
+        firstMatchingContainer.id
+      )
+    } catch {
+      console.warn('failed to re-open tabs', activeTabs, 'in container', firstMatchingContainer)
+    }
+  })
+
   Logs.info(`Init end: ${performance.now() - ts}ms`)
 })()
 

src/manifest.json

@@ -465,5 +465,8 @@
   },
   "background": {
     "page": "bg/background.html"
+  },
+  "omnibox": {
+    "keyword": "sb"
   }
 }

src/sidebar/sidebar.ts

@@ -43,6 +43,7 @@ async function main(): Promise<void> {
     getTabsTreeData: Tabs.getTabsTreeData,
     moveTabsToThisWin: Tabs.moveToThisWin,
     openTabs: Tabs.open,
+    reopenInContainer: Tabs.reopenInContainer,
     handleReopening: Tabs.handleReopening,
     getActivePanelConfig: Sidebar.getActivePanelConfig,
     stopDrag: DnD.reset,

src/types/ipc.ts

@@ -111,6 +111,7 @@ export type SidebarActions = {
 
   moveTabsToThisWin: (tabs: Tab[], dst?: DstPlaceInfo) => Promise<boolean>
   openTabs: (items: ItemInfo[], dst: DstPlaceInfo) => Promise<boolean>
+  reopenInContainer: (ids: ID[], containerId: string) => Promise<void>
 
   notify: (config: Notification, timeout?: number) => void
   notifyAboutNewSnapshot: () => void