Removal of more SDK code

webextension/background.js

@@ -1,12 +1,7 @@
 const MAJOR_VERSIONS = ["2.3.0"];
+const LOOKUP_KEY = "$ref";
 
 const assignManager = {
-  CLOSEABLE_WINDOWS: new Set([
-    "about:startpage",
-    "about:newtab",
-    "about:home",
-    "about:blank"
-  ]),
   MENU_ASSIGN_ID: "open-in-this-container",
   MENU_REMOVE_ID: "remove-open-in-this-container",
   storageArea: {
@@ -133,14 +128,14 @@ const assignManager = {
            We aim to open the new assigned container tab / warning prompt in it's own tab:
              - As the history won't span from one container to another it seems most sane to not try and reopen a tab on history.back()
              - When users open a new tab themselves we want to make sure we don't end up with three tabs as per: https://github.com/mozilla/testpilot-containers/issues/421
-           If we are coming from an internal url that are used for the new tab page (CLOSEABLE_WINDOWS), we can safely close as user is unlikely losing history
+           If we are coming from an internal url that are used for the new tab page (NEW_TAB_PAGES), we can safely close as user is unlikely losing history
            Detecting redirects on "new tab" opening actions is pretty hard as we don't get tab history:
            - Redirects happen from Short URLs and tracking links that act as a gateway
            - Extensions don't provide a way to history crawl for tabs, we could inject content scripts to do this
                however they don't run on about:blank so this would likely be just as hacky.
            We capture the time the tab was created and close if it was within the timeout to try to capture pages which haven't had user interaction or history.
         */
-        if (this.CLOSEABLE_WINDOWS.has(tab.url)
+        if (backgroundLogic.NEW_TAB_PAGES.has(tab.url)
             || (messageHandler.lastCreatedTab
             && messageHandler.lastCreatedTab.id === tab.id)) {
           browser.tabs.remove(tab.id);
@@ -218,7 +213,7 @@ const assignManager = {
     const loadPage = browser.extension.getURL("confirm-page.html");
     // If the user has explicitly checked "Never Ask Again" on the warning page we will send them straight there
     if (neverAsk) {
-      browser.tabs.create({url, cookieStoreId: `firefox-container-${userContextId}`, index});
+      browser.tabs.create({url, cookieStoreId: backgroundLogic.cookieStoreId(userContextId), index});
       backgroundLogic.sendTelemetryPayload({
         event: "auto-reload-page-in-container",
         userContextId: userContextId,
@@ -229,7 +224,7 @@ const assignManager = {
         userContextId: userContextId,
       });
       const confirmUrl = `${loadPage}?url=${url}`;
-      browser.tabs.create({url: confirmUrl, cookieStoreId: `firefox-container-${userContextId}`, index}).then(() => {
+      browser.tabs.create({url: confirmUrl, cookieStoreId: backgroundLogic.cookieStoreId(userContextId), index}).then(() => {
         // We don't want to sync this URL ever nor clutter the users history
         browser.history.deleteUrl({url: confirmUrl});
       }).catch((e) => {
@@ -241,6 +236,13 @@ const assignManager = {
 
 
 const backgroundLogic = {
+  NEW_TAB_PAGES: new Set([
+    "about:startpage",
+    "about:newtab",
+    "about:home",
+    "about:blank"
+  ]),
+
   deleteContainer(userContextId) {
     this.sendTelemetryPayload({
       event: "delete-container",
@@ -291,6 +293,41 @@ const backgroundLogic = {
     });
   },
 
+  openTab(options) {
+    let url = options.url || undefined;
+    const userContextId = ("userContextId" in options) ? options.userContextId : 0;
+    const active = ("nofocus" in options) ? options.nofocus : true;
+    const source = ("source" in options) ? options.source : null;
+
+    // Only send telemetry for tabs opened by UI - i.e., not via showTabs
+    if (source && userContextId) {
+      this.sendTelemetryPayload({
+        "event": "open-tab",
+        "eventSource": source,
+        "userContextId": userContextId,
+        "clickedContainerTabCount": LOOKUP_KEY
+      });
+    }
+    // Autofocus url bar will happen in 54: https://bugzilla.mozilla.org/show_bug.cgi?id=1295072
+
+    // We can't open new tab pages, so open a blank tab. Used in tab un-hide
+    if (this.NEW_TAB_PAGES.has(url)) {
+      url = undefined;
+    }
+
+    // Unhide all hidden tabs
+    browser.runtime.sendMessage({
+      method: "showTabs",
+      userContextId: options.userContextId
+    });
+    return browser.tabs.create({
+      url,
+      active,
+      pinned: options.pinned || false,
+      cookieStoreId: backgroundLogic.cookieStoreId(options.userContextId)
+    });
+  },
+
   sendTelemetryPayload(message = {}) {
     if (!message.event) {
       throw new Error("Missing event name for telemetry");
@@ -317,6 +354,7 @@ const messageHandler = {
   LAST_CREATED_TAB_TIMER: 2000,
 
   init() {
+    // Handles messages from webextension/js/popup.js
     browser.runtime.onMessage.addListener((m) => {
       let response;
 
@@ -327,6 +365,10 @@ const messageHandler = {
       case "createOrUpdateContainer":
         response = backgroundLogic.createOrUpdateContainer(m.message);
         break;
+      case "openTab":
+        // Same as open-tab for index.js
+        response = backgroundLogic.openTab(m.message);
+        break;
       case "neverAsk":
         assignManager._neverAsk(m);
         break;
@@ -341,6 +383,9 @@ const messageHandler = {
       case "lightweight-theme-changed":
         themeManager.update(m.message);
         break;
+      case "open-tab":
+        backgroundLogic.openTab(m.message);
+        break;
       default:
         throw new Error(`Unhandled message type: ${m.message}`);
       }