[WIP] Remote Func Refac: Results from testing: Fix some func argument…

… types and small fixes

src/activity-logger/background/log-page-visit.ts

@@ -2,8 +2,10 @@ import { Tabs } from 'webextension-polyfill-ts'
 import moment from 'moment'
 
 import { TabManager } from './tab-manager'
+// @ts-ignore
 import analyzePage, { PageAnalyzer } from '../../page-analysis/background'
 import * as searchIndex from '../../search'
+
 import { FavIconChecker } from './types'
 
 interface Props {

src/bookmarks/readme.md

@@ -14,9 +14,9 @@ It is currently un-used as previously, only the call to bookmark a search result
 
 ### Remote function usage:
 
-1. Remote Function call, with only url
+1. Remote Function call, with only url (note this is `addPageBookmark` not `addBookmark`)
 
- In `src/overview/results/actions.ts:95` as `bookmarkRPC({ url })`
+ In `src/overview/results/actions.ts:95` as `addPageBookmark({ url })`
 
 2. Remote Function call, with tabId
 

src/content-tooltip/interactions.ts

@@ -226,9 +226,9 @@ export function userSelectedText() {
  const container = selection.getRangeAt(0).commonAncestorContainer
  const extras = isAnchorOrContentEditable(container)
 
- const userSelectedText =
+ const userSelectedTextString =
  !!selection && !selection.isCollapsed && !!selectedString && !extras
- return userSelectedText
+ return userSelectedTextString
 }
 
 function isTargetInsideTooltip(event) {

src/page-analysis/background/index.ts

@@ -34,8 +34,6 @@ export default async function analysePage({
 
  // Fetch the data
  const dataFetchingPromises = [
- // todo: remote-functions-refactor: should extractPageContent ever be called like this without params? is it used?
- // @ts-ignore
  allowContent ? extractPageContent() : Promise.resolve(),
  allowScreenshot ? makeScreenshot({ tabId }) : Promise.resolve(),
  allowFavIcon ? getFavIcon({ tabId }) : Promise.resolve(),

src/page-analysis/content_script/extract-page-content.js → src/page-analysis/content_script/extract-page-content.ts

@@ -5,6 +5,7 @@ import { getMetadata } from 'page-metadata-parser'
 import transformPageHTML from 'src/util/transform-page-html'
 import PAGE_METADATA_RULES from './page-metadata-rules'
 import extractPdfContent from './extract-pdf-content'
+import { ExtractPageContent } from 'src/page-analysis/types'
 
 export const DEF_LANG = 'en'
 
@@ -21,7 +22,7 @@ export default async function extractPageContent(
 ) {
  // If it is a PDF, run code for pdf instead.
  if (url.endsWith('.pdf')) {
- return extractPdfContent({ url })
+ return extractPdfContent({ url, blob: undefined })
  }
 
  // Apply simple transformations to clean the page's HTML

src/page-analysis/content_script/index.js

@@ -1,9 +1,6 @@
 import { makeRemotelyCallable } from 'src/util/webextensionRPC'
 import extractPageContent from './extract-page-content'
-import { PageAnalyzerInterface } from 'src/page-analysis/types'
 
-makeRemotelyCallable <
- PageAnalyzerInterface >
- {
- extractPageContent,
- }
+makeRemotelyCallable({
+ extractPageContent,
+})

src/page-analysis/types.ts

@@ -2,4 +2,4 @@ export interface PageAnalyzerInterface {
  extractPageContent: ExtractPageContent
 }
 
-export type ExtractPageContent = (doc, url: string) => any
+export type ExtractPageContent = (doc?, url?: any) => any

src/search/bookmarks.ts

@@ -14,6 +14,7 @@ export const addBookmark = (getDb: DBGet, tabManager: TabManager) => async ({
  timestamp?: number
  tabId?: number
 }) => {
+ // url = normalizeUrl(url);
  let page = await getPage(getDb)(url)
 
  if (page == null || page.isStub) {

src/sidebar-overlay/ribbon/types.ts

@@ -18,7 +18,7 @@ export default interface State {
 
 export interface RibbonInteractionsInterface {
  insertRibbon: ({ override, ...args }?: { override?: boolean } | any) => any
- removeRibbon: ({ override }: { override?: boolean }) => any
+ removeRibbon: ({ override }?: { override?: boolean }) => any
  insertOrRemoveRibbon: () => any
  updateRibbon: () => any
 }

src/util/notification-types.ts

@@ -3,7 +3,7 @@ import { Notifications } from 'webextension-polyfill-ts/src/generated/notificati
 // Chrome allows some extra notif opts that the standard web ext API doesn't support
 export interface NotifOpts extends Notifications.CreateNotificationOptions {
  [chromeKeys: string]: any
- requireInteraction: boolean
+ requireInteraction?: boolean
 }
 
 export type CreateNotificationInterface = (

src/util/webextensionRPC.ts

@@ -45,7 +45,7 @@ export class RemoteError extends Error {
 interface RPCOpts {
  tabId?: number
 
- //todo: remove any references to this
+ // todo: remove any references to this
  throwWhenNoResponse?: boolean
 }
 
@@ -76,7 +76,9 @@ type InterfaceWithTabId<T> = T & { tabId: number }
 export function runInBackground<T extends object>(): T {
  return new Proxy<T>({} as T, {
  get(target, property): any {
- return (...args) => remoteFunction(property.toString())(args)
+ return (...args) => {
+ return remoteFunction(property.toString())(...args)
+ }
  },
  })
 }
@@ -85,8 +87,9 @@ export function runInBackground<T extends object>(): T {
 export function runInTab<T extends object>(tabId): T {
  return new Proxy<T>({} as T, {
  get(target, property): any {
- return (...args) =>
- remoteFunction(property.toString(), { tabId })(args)
+ return (...args) => {
+ return remoteFunction(property.toString(), { tabId })(...args)
+ }
  },
  })
 }