fix: shortcuts now send messages to all frames

src/background/handlers/selection-as-concatenated-plain-text.ts

@@ -3,14 +3,17 @@ import { createTabClient } from '@delight-rpc/webextension'
 import { IFrameAPI } from '@src/contract.js'
 import { CommandHandler } from './types.js'
 import { concatPlainText } from '@utils/concat-plain-text.js'
+import { assert, isntNull } from '@blackglory/prelude'
 
 export const commandSelectionAsConcatenatedPlainText: CommandHandler = async (info, tab) => {
   if (tab.id) {
     const tabClient = createTabClient<IFrameAPI>({
       tabId: tab.id
     , frameId: info.frameId
     })
+
     const text = await tabClient.getSelectionText()
+    assert(isntNull(text))
 
     return plainText(concatPlainText(text))
   }

src/background/handlers/selection-as-markdown.ts

@@ -5,6 +5,7 @@ import { CommandHandler } from './types.js'
 import { getConfig } from '@background/storage.js'
 import { pipeAsync } from 'extra-utils'
 import { offscreen } from '@background/offscreen-client.js'
+import { assert, isntNull } from '@blackglory/prelude'
 
 export const commandSelectionAsMarkdown: CommandHandler = async (info, tab) => {
   if (tab.id) {
@@ -16,7 +17,9 @@ export const commandSelectionAsMarkdown: CommandHandler = async (info, tab) => {
         tabId: tab.id
       , frameId: info.frameId
       })
+
       const html = await client.getSelectionHTML()
+      assert(isntNull(html))
 
       return plainText(
         await pipeAsync(

src/background/handlers/selection-as-plain-text.ts

@@ -2,14 +2,17 @@ import { plainText } from './utils.js'
 import { createTabClient } from '@delight-rpc/webextension'
 import { IFrameAPI } from '@src/contract.js'
 import { CommandHandler } from './types.js'
+import { assert, isntNull } from '@blackglory/prelude'
 
 export const commandSelectionAsPlainText: CommandHandler = async (info, tab) => {
   if (tab.id) {
     const tabClient = createTabClient<IFrameAPI>({
       tabId: tab.id
     , frameId: info.frameId
     })
+
     const text = await tabClient.getSelectionText()
+    assert(isntNull(text))
 
     return plainText(text)
   }

src/background/handlers/utils.ts

@@ -1,3 +1,4 @@
+import { assert, isntNull } from '@blackglory/prelude'
 import { CommandResultType, CommandResult } from './types.js'
 import { createTabClient } from '@delight-rpc/webextension'
 import { IFrameAPI } from '@src/contract.js'
@@ -21,5 +22,9 @@ export async function getActiveElementTextContent(
 , frameId?: number
 ): Promise<string> {
   const tabClient = createTabClient<IFrameAPI>({ tabId, frameId })
-  return await tabClient.getActiveElementTextContent()
+
+  const text = await tabClient.getActiveElementTextContent()
+  assert(isntNull(text))
+
+  return text
 }

src/background/index.ts

@@ -8,6 +8,8 @@ import { IBackgroundAPI } from '@src/contract.js'
 import { ImplementationOf } from 'delight-rpc'
 import { createServer } from '@delight-rpc/webextension'
 import { updateMenu } from './menu.js'
+import { isDev } from '@utils/is-dev.js'
+import { assert, isntUndefined } from '@blackglory/prelude'
 
 const launched = new Deferred<void>()
 
@@ -72,14 +74,29 @@ chrome.contextMenus.onClicked.addListener(async (info, tab) => {
 })
 
 chrome.commands.onCommand.addListener(async (command, tab) => {
-  const result = await commandHandlers[command](
-    {}
-  , tab ?? await getActiveTab()
+  tab = tab ?? await getActiveTab()
+
+  const tabId = tab.id
+  assert(isntUndefined(tabId))
+
+  const frames = await chrome.webNavigation.getAllFrames({ tabId }) ?? []
+
+  const result = await Promise.any(
+    frames.map(async frame => {
+      const result = await commandHandlers[command](
+        {
+          frameUrl: frame.url
+        , frameId: frame.frameId
+        }
+      , tab
+      )
+      assert(isntUndefined(result))
+
+      return result
+    })
   )
 
-  if (result) {
-    await handleCommandResult(result)
-  }
+  await handleCommandResult(result)
 })
 
 async function ensureOffscreenDocument(): Promise<void> {

src/content-script.ts

@@ -1,5 +1,6 @@
 import { createServer } from '@delight-rpc/webextension'
 import { IFrameAPI } from '@src/contract.js'
+import { isDev } from '@utils/is-dev.js'
 
 if (isDev()) {
   console.info(`[${chrome.runtime.getManifest().name}] The content script is injected`)
@@ -12,7 +13,7 @@ createServer<IFrameAPI>({
 , getSelectionText
 })
 
-function getSelectionHTML(): string {
+function getSelectionHTML(): string | null {
   const userSelection = window.getSelection()
   if (userSelection && userSelection.rangeCount) {
     const range = userSelection.getRangeAt(0)
@@ -21,22 +22,18 @@ function getSelectionHTML(): string {
     div.appendChild(clonedSelection)
     return div.innerHTML
   } else {
-    return ''
+    return null
   }
 }
 
-function getSelectionText(): string {
-  return window.getSelection()?.toString() ?? ''
+function getSelectionText(): string | null {
+  return window.getSelection()?.toString() ?? null
 }
 
-function getActiveElementTextContent(): string {
-  return document.activeElement?.textContent ?? ''
+function getActiveElementTextContent(): string | null {
+  return document.activeElement?.textContent ?? null
 }
 
 function getDocumentTitle(): string {
   return document.title
 }
-
-function isDev(): boolean {
-  return process.env.NODE_ENV === 'development'
-}

src/contract.ts

@@ -114,9 +114,9 @@ export interface IHTMLCleanerAllowlistItem {
 }
 
 export interface IFrameAPI {
-  getSelectionHTML(): string
-  getSelectionText(): string
-  getActiveElementTextContent(): string
+  getSelectionHTML(): string | null
+  getSelectionText(): string | null
+  getActiveElementTextContent(): string | null
   getDocumentTitle(): string
 }
 

src/manifest.dev.json

@@ -93,6 +93,7 @@
   , "clipboardWrite"
   , "offscreen"
   , "storage"
+  , "webNavigation"
   ]
 , "host_permissions": [
     "<all_urls>"

src/manifest.prod.json

@@ -93,6 +93,7 @@
   , "clipboardWrite"
   , "offscreen"
   , "storage"
+  , "webNavigation"
   ]
 , "host_permissions": [
     "<all_urls>"

src/utils/is-dev.ts

@@ -0,0 +1,3 @@
+export function isDev(): boolean {
+  return process.env.NODE_ENV === 'development'
+}