Fix import of SearchBackground class in search-injection logic

- Was only being used as a type, but not sure if our webpack setup is smart enough to pick that up and not actually include it in the search injection CS bundle.
- Regardless, it was the wrong type being used. RemoteSearchInterface has the RPCs, following the same pattern as most of our BG classes
- Also removed the `requestSearcher` param as it can be gotten from `searchBG`

src/content-scripts/content_script/in-page-ui-injections.ts

@@ -8,6 +8,7 @@ import type { ContentScriptRegistry, InPageUIInjectionsMain } from './types'
 import { renderUpgradeModal } from 'src/search-injection/upgrade-modal-display'
 import { handleRenderPDFOpenButton } from 'src/search-injection/pdf-open-button'
 import { handleRenderImgActionButtons } from 'src/search-injection/img-action-buttons'
+import type { SearchEngineName } from 'src/search-injection/types'
 
 export const main: InPageUIInjectionsMain = async ({
     inPageUI,
@@ -60,7 +61,7 @@ export const main: InPageUIInjectionsMain = async ({
                 )
             } else if (component === 'search-engine-integration') {
                 const url = window.location.href
-                const matched = utils.matchURL(url)
+                const matched = utils.matchURL(url) as SearchEngineName | false
 
                 if (matched) {
                     const searchInjection =
@@ -73,7 +74,6 @@ export const main: InPageUIInjectionsMain = async ({
 
                             await handleRenderSearchInjection(
                                 query,
-                                searchDisplayProps.searchBG.unifiedSearch,
                                 matched,
                                 syncSettings,
                                 () =>

src/search-injection/components/container.tsx

@@ -6,25 +6,20 @@ import strictUriEncode from 'strict-uri-encode'
 import ResultItem from './ResultItem'
 import RemovedText from './RemovedText'
 import * as constants from '../constants'
-import { getLocalStorage } from '../utils'
 import Notification from './Notification'
 import { UPDATE_NOTIFS } from '../../notifications/notifications'
 import * as actionTypes from '../../notifications/action-types'
 import ActionButton from '../../notifications/components/ActionButton'
 import OptIn from '../../notifications/components/OptIn'
 import ToggleSwitch from '../../common-ui/components/ToggleSwitch'
 import type { SearchEngineName, ResultItemProps } from '../types'
-import CloudUpgradeBanner from 'src/personal-cloud/ui/components/cloud-upgrade-banner'
-import { STORAGE_KEYS as CLOUD_STORAGE_KEYS } from 'src/personal-cloud/constants'
 import type { SyncSettingsStore } from 'src/sync-settings/util'
 import { OVERVIEW_URL } from 'src/constants'
-import { sleepPromise } from 'src/util/promises'
 import styled from 'styled-components'
 import LoadingIndicator from '@worldbrain/memex-common/lib/common-ui/components/loading-indicator'
 import Icon from '@worldbrain/memex-common/lib/common-ui/components/icon'
 import IconBox from '@worldbrain/memex-common/lib/common-ui/components/icon-box'
-import { UITaskState } from '@worldbrain/memex-common/lib/main-ui/types'
-import SearchBackground from 'src/search/background'
+import type { RemoteSearchInterface } from 'src/search/background/types'
 
 const search = browser.runtime.getURL('/img/search.svg')
 
@@ -39,7 +34,7 @@ export interface Props {
     updateQuery: (query: string) => Promise<void>
     query: string
     openSettings: () => void
-    searchBG: SearchBackground
+    searchBG: RemoteSearchInterface
     openPDFinViewer: (url: string) => Promise<void>
 }
 

src/search-injection/searchInjection.tsx

@@ -14,16 +14,13 @@ import {
 } from 'src/common-ui/components/design-library/theme'
 import type { MemexThemeVariant } from '@worldbrain/memex-common/lib/common-ui/styles/types'
 import type { ResultItemProps, SearchEngineName } from './types'
-import { SyncSettingsStore } from 'src/sync-settings/util'
+import type { SyncSettingsStore } from 'src/sync-settings/util'
 import type { RemoteSearchInterface } from 'src/search/background/types'
-import { ContentIdentifier } from 'src/search/types'
 import { isMemexPageAPdf } from '@worldbrain/memex-common/lib/page-indexing/utils'
-import SearchBackground from 'src/search/background'
 
 interface RootProps {
     rootEl: HTMLElement
     query: string
-    requestSearcher: RemoteSearchInterface['unifiedSearch']
     renderComponent: () => Promise<void>
     searchEngine: SearchEngineName
     syncSettings: SyncSettingsStore<
@@ -36,7 +33,7 @@ interface RootProps {
     >
     position: 'side' | 'above'
     openSettings: () => void
-    searchBG: SearchBackground
+    searchBG: RemoteSearchInterface
     openPDFinViewer: (url: string) => Promise<void>
 }
 
@@ -62,9 +59,8 @@ class Root extends React.Component<RootProps, RootState> {
     }
 
     private executeSearch = async (query: string) => {
-        const { requestSearcher } = this.props
         const limit = 100
-        const searchRes = await requestSearcher({
+        const searchRes = await this.props.searchBG.unifiedSearch({
             query,
             limit,
             skip: 0,
@@ -103,8 +99,6 @@ class Root extends React.Component<RootProps, RootState> {
             searchResDocsProcessedPromises,
         )
 
-        console.log('searchResDocsProcessed', searchResDocsProcessed)
-
         this.setState({
             searchResDocsProcessed: searchResDocsProcessed,
         })
@@ -148,9 +142,8 @@ class Root extends React.Component<RootProps, RootState> {
 
 // TODO: Type this
 export const handleRenderSearchInjection = async (
-    query,
-    requestSearcher,
-    searchEngine,
+    query: string,
+    searchEngine: SearchEngineName,
     syncSettings: SyncSettingsStore<
         | 'extension'
         | 'inPageUI'
@@ -159,9 +152,9 @@ export const handleRenderSearchInjection = async (
         | 'searchInjection'
         | 'dashboard'
     >,
-    openSettings,
-    searchBG,
-    openPDFinViewer,
+    openSettings: () => void,
+    searchBG: RemoteSearchInterface,
+    openPDFinViewer: (url: string) => Promise<void>,
 ) => {
     // docs: (array of objects) returned by the search.
     // totalCount: (int) number of results found
@@ -376,7 +369,6 @@ export const handleRenderSearchInjection = async (
                 syncSettings={syncSettings}
                 searchEngine={searchEngine}
                 renderComponent={renderComponent}
-                requestSearcher={requestSearcher}
                 openSettings={openSettings}
                 searchBG={searchBG}
                 openPDFinViewer={openPDFinViewer}