extension: migrate all chrome. calls to browser. in preparation of ty…

…pescript migration

extension/__mocks__/browser.js

@@ -10,6 +10,21 @@ const mockBrowser = {
   bookmarks: {
     getTree: jest.fn(),
   },
+  storage: {
+    sync: {
+      // meh.
+      get: (name, res) => {
+        res({'options': {
+          host: 'http://badhost:43210', // some random port, to cause it fail
+        }})
+      }
+    },
+  },
+  runtime: {
+    lastError: null,
+    getManifest    : () => { return {version: 'whatever'} },
+    getPlatformInfo: async () => {},
+  },
 }
 
 export default mockBrowser

extension/flow-typed/webextension-polyfill.js

@@ -192,6 +192,8 @@ declare var browser: {
 
 
 declare module "webextension-polyfill" {
+  declare var browserAction: chrome$browserAction;
+  declare var pageAction   : chrome$pageAction;
   declare var bookmarks    : browser$bookmarks;
   declare var history      : browser$history;
   declare var storage      : browser$storage;

extension/src/api.js

@@ -1,4 +1,5 @@
 /* @flow */
+import browser from "webextension-polyfill"
 
 /*
  * Communication with backend
@@ -50,7 +51,8 @@ export async function queryBackendCommon<R>(params: any, endp: string): Promise<
     }
 
     const endpoint = `${opts.host}/${endp}`
-    params['client_version'] = chrome.runtime.getManifest().version
+    // $FlowFixMe
+    params['client_version'] = browser.runtime.getManifest().version
 
     function with_stack(e: Error): Error {
         const stack = []

extension/src/background.js

@@ -27,11 +27,11 @@ function actions(): Array<Action> {
     // but we can use pageAction to show at least some (default) icon in some circumstances
 
     // https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Differences_between_desktop_and_Android#User_interface
-    const res: Array<Action> = [chrome.browserAction]
+    const res: Array<Action> = [browser.browserAction]
 
     // need to be defensive, it's only for mobile firefox
-    if (chrome.pageAction) {
-        res.push(chrome.pageAction)
+    if (browser.pageAction) {
+        res.push(browser.pageAction)
     } else {
         // this is a bit backwards because we need to register callbacks synchronously
         // otherwise isn't not working well after background page unloads
@@ -233,7 +233,7 @@ async function updateState(tab: TabUrl): Promise<void> {
      *    otherwise, we're relying on 'mobile_sidebar_injector' to open the sidebar
      */
     if (await isMobile()) {
-        const action = chrome.pageAction;
+        const action = browser.pageAction;
         const interesting = [
             'images/ic_visited_48.png',
             'images/ic_relatives_48.png',
@@ -295,7 +295,8 @@ async function updateState(tab: TabUrl): Promise<void> {
 
 function sendSidebarMessage(tabId: number, message: any) {
     // ugh.. just so I don't shoot myself in the foot again with using runtime.sendMessage...
-    chrome.tabs.sendMessage(tabId, message)
+    // $FlowFixMe
+    browser.tabs.sendMessage(tabId, message)
 }
 
 
@@ -601,8 +602,10 @@ async function handleOpenSearch(p: SearchPageParams = {}) {
         params.append(k, v)
     }
     const ps = params.toString()
-    const search_url = chrome.runtime.getURL('search.html') + (ps.length == 0 ? '' : '?' + ps)
-    chrome.tabs.create({url: search_url})
+    // $FlowFixMe
+    const search_url = browser.runtime.getURL('search.html') + (ps.length == 0 ? '' : '?' + ps)
+    // $FlowFixMe
+    browser.tabs.create({url: search_url})
     // TODO get current tab url and pass as get parameter?
 }
 
@@ -967,7 +970,8 @@ function initContextMenus(): void {
     */
     browser.contextMenus.removeAll().then(() => {
         for (const {id: id, title: title, parentId: parentId, contexts: contexts} of MENUS) {
-            chrome.contextMenus.create({
+            // $FlowFixMe
+            browser.contextMenus.create({
                 id: id,
                 parentId: parentId,
                 title: title,
@@ -976,7 +980,8 @@ function initContextMenus(): void {
         }
 
         for (const {id: id, title: title, parentId: parentId, contexts: contexts} of TOGGLES) {
-            chrome.contextMenus.create({
+            // $FlowFixMe
+            browser.contextMenus.create({
                 id: id,
                 parentId: parentId,
                 title: title,
@@ -1013,7 +1018,8 @@ function updateContextMenus(opts: Options): void {
         return
     }
     for (const {id: id, checker: checker} of TOGGLES) {
-        chrome.contextMenus.update(
+        // $FlowFixMe
+        browser.contextMenus.update(
             id,
             {checked: checker(opts)},
         )
@@ -1026,14 +1032,15 @@ function initBackground(): void {
     // otherwise doesn't work well with background page suspension
 
     // $FlowFixMe
-    chrome.runtime.onMessage.addListener(onMessageCallback)
+    browser.runtime.onMessage.addListener(onMessageCallback)
 
     registerActions()
 
     // need to be defensive since commands API isn't available under mobile browser
-    if (chrome.commands) {
+    // $FlowFixMe
+    if (browser.commands) {
         //  $FlowFixMe // err, complains at Promise but nevertheless works
-        chrome.commands.onCommand.addListener(onCommandCallback)
+        browser.commands.onCommand.addListener(onCommandCallback)
     } else {
         isMobile().then(mobile => {
             if (!mobile) {
@@ -1046,7 +1053,8 @@ function initBackground(): void {
 }
 
 
-chrome.runtime.onMessage.addListener((info: any, _: chrome$MessageSender) => {
+// $FlowFixMe
+browser.runtime.onMessage.addListener((info: any, _: chrome$MessageSender) => {
     // see selenium_bridge.js
     if (info === 'selenium-bridge-_execute_browser_action') {
         handleToggleSidebar()

extension/src/display.js

@@ -1,4 +1,6 @@
 /* @flow */
+import browser from "webextension-polyfill"
+
 import type {Url, Src, Locator} from './common';
 import {Methods, unwrap, safeSetInnerHTML} from './common';
 import type {Options} from './options'
@@ -140,7 +142,8 @@ export class Binder {
         dt_c.onclick = () => {
             // TODO not sure about floor...
             const utc_timestamp_s = Math.floor(timestamp.getTime() / 1000);
-            chrome.runtime.sendMessage({
+            // $FlowFixMe
+            browser.runtime.sendMessage({
                 method   : Methods.SEARCH_VISITS_AROUND,
                 utc_timestamp_s: utc_timestamp_s,
             });

extension/src/notifications.js

@@ -9,7 +9,8 @@ import {getOptions} from './options';
 // last resort.. because these could be annoying (also might not make sense to display globally)
 // only using it when there is no other context (e.g. current tab) to show a notification
 export function desktopNotify(message: string, priority: number=0) {
-    chrome.notifications.create({
+    // $FlowFixMe
+    browser.notifications.create({
         'type'    : "basic",
         'title'   : "promnesia",
         'message' : message,

extension/src/sidebar.js

@@ -60,7 +60,8 @@ class Sidebar {
         const cdoc = frame.contentDocument;
         const head = unwrap(cdoc.head);
 
-        const sidebar_css = chrome.runtime.getURL("sidebar.css")
+        // $FlowFixMe
+        const sidebar_css = browser.runtime.getURL("sidebar.css")
         const link = cdoc.createElement("link");
         link.href = sidebar_css;
         link.type = "text/css";
@@ -651,7 +652,8 @@ const onMessageListener = (msg: any, _: chrome$MessageSender) => {
 if (window.promnesia_haslistener == null) {
     window.promnesia_haslistener = true
     console.debug(`[promnesia] [sidebar-${UUID}] registering callbacks`)
-    chrome.runtime.onMessage.addListener(onMessageListener)
+    // $FlowFixMe
+    browser.runtime.onMessage.addListener(onMessageListener)
 } else {
     console.debug(`[promnesia] [sidebar-${UUID}] skipping callback registration, they are already present`)
 }

extension/tests/integration.test.js

@@ -7,23 +7,8 @@
 
 import {setOptions, getOptions} from '../src/options'
 
-global.chrome = {
-    storage: {
-        sync: {
-            // meh.
-            get: (name, res) => {
-                res({'options': {
-                    host: 'http://badhost:43210', // some random port, to cause it fail
-                }})
-            }
-        },
-    },
-    runtime: {
-        lastError: null,
-        getManifest    : () => { return {version: 'whatever'} },
-    },
-}
-
+import mockBrowser from "../__mocks__/browser"
+global.chrome = mockBrowser
 
 test('options', async () => {
     // shouldn't crash at least..
@@ -50,8 +35,6 @@ test('visits', async() => {
 
 import {allsources} from '../src/sources'
 
-import mockBrowser from "../__mocks__/browser"
-
 // meh.
 mockBrowser.history.getVisits.mockImplementation(async (obj) => [])
 mockBrowser.history.search   .mockImplementation(async (obj) => [])