Clean up shim initialization

ext/src/main.ts

@@ -258,14 +258,7 @@ browser.menus.onShown.addListener(info => {
 browser.webRequest.onBeforeRequest.addListener(
         async details => {
             await browser.tabs.executeScript(details.tabId, {
-                code: `window._isFramework = ${
-                        details.url === CAST_FRAMEWORK_LOADER_SCRIPT_URL}`
-              , frameId: details.frameId
-              , runAt: "document_start"
-            });
-
-            await browser.tabs.executeScript(details.tabId, {
-                file: "shim/content.js"
+                file: "shim/contentBridge.js"
               , frameId: details.frameId
               , runAt: "document_start"
             });
@@ -402,7 +395,7 @@ browser.runtime.onMessage.addListener(async message => {
 // Defines window.chrome for site compatibility
 browser.contentScripts.register({
     allFrames: true
-  , js: [{ file: "shim/contentSetup.js" }]
+  , js: [{ file: "shim/content.js" }]
   , matches: [ "<all_urls>" ]
   , runAt: "document_start"
 });

ext/src/shim/cast/classes/Session.ts

@@ -18,7 +18,7 @@ import { ErrorCode
 
 import { ListenerObject
        , onMessage
-       , sendMessageResponse } from "../../messageBridge";
+       , sendMessageResponse } from "../../eventMessageChannel";
 
 import { Callbacks
        , CallbacksMap

ext/src/shim/cast/index.ts

@@ -28,7 +28,7 @@ import * as media from "./media";
 
 import { ReceiverSelectorMediaType }
         from "../../receiver_selectors/ReceiverSelector";
-import { onMessage, sendMessageResponse } from "../messageBridge";
+import { onMessage, sendMessageResponse } from "../eventMessageChannel";
 
 
 type ReceiverActionListener = (

ext/src/shim/cast/media/classes/Media.ts

@@ -23,7 +23,7 @@ import { PlayerState
 import _Error from "../../classes/Error";
 import { ErrorCode } from "../../enums";
 
-import { onMessage, sendMessageResponse } from "../../../messageBridge";
+import { onMessage, sendMessageResponse } from "../../../eventMessageChannel";
 
 import { Callbacks
        , CallbacksMap

ext/src/shim/content.ts

@@ -1,42 +1,38 @@
 "use strict";
 
-import { Message } from "../types";
-import { onMessageResponse, sendMessage } from "./messageBridge";
-
-import { loadScript } from "../lib/utils";
+import { CAST_LOADER_SCRIPT_URL
+       , CAST_SCRIPT_URLS } from "../endpoints";
 
 
-if ((window as any)._isFramework) {
-    loadScript(browser.runtime.getURL("vendor/webcomponents-lite.js"));
-}
+const _window = (window.wrappedJSObject as any);
+
+_window.chrome = cloneInto({}, window);
+_window.navigator.presentation = cloneInto({}, window);
 
 
-// Message ports
-const backgroundPort = browser.runtime.connect({ name: "shim" });
-let popupPort: browser.runtime.Port;
+/**
+ * Replace the src property setter on <script> elements to
+ * intercept the new value.
+ *
+ * If it matches one of Chrome's cast extension sender script
+ * URLs, replace it with the standard API URL, the request for
+ * which is handled in the main script.
+ */
+const { get, set } = Reflect.getOwnPropertyDescriptor(
+        HTMLScriptElement.prototype.wrappedJSObject, "src");
 
+Reflect.defineProperty(
+        HTMLScriptElement.prototype.wrappedJSObject, "src", {
 
-// Set popupPort once it connects
-browser.runtime.onConnect.addListener(port => {
-    if (port.name === "popup") {
-        popupPort = port;
-    }
+    configurable: true
+  , enumerable: true
+  , get
 
-    port.onMessage.addListener(sendMessage);
-});
-
-// Forward background messages to shim
-backgroundPort.onMessage.addListener(sendMessage);
-
-// Forward shim messages to popup and background script
-onMessageResponse((message: Message) => {
-    const [ destination ] = message.subject.split(":/");
-
-    if (destination === "popup") {
-        if (popupPort) {
-            popupPort.postMessage(message);
+  , set: exportFunction(function (value) {
+        if (CAST_SCRIPT_URLS.includes(value)) {
+            return set.call(this, CAST_LOADER_SCRIPT_URL);
         }
-    } else {
-        backgroundPort.postMessage(message);
-    }
+
+        return set.call(this, value);
+    }, window)
 });

ext/src/shim/contentBridge.ts

@@ -0,0 +1,15 @@
+"use strict";
+
+import { onMessageResponse, sendMessage } from "./eventMessageChannel";
+
+
+// Message port to background script
+const backgroundPort = browser.runtime.connect({ name: "shim" });
+
+// Forward background messages to shim
+backgroundPort.onMessage.addListener(sendMessage);
+
+// Forward shim messages to background
+onMessageResponse(message => {
+    backgroundPort.postMessage(message);
+});

ext/src/shim/contentSetup.ts

@@ -1,38 +0,0 @@
-"use strict";
-
-import { CAST_LOADER_SCRIPT_URL
-       , CAST_SCRIPT_URLS } from "../endpoints";
-
-
-const _window = (window.wrappedJSObject as any);
-
-_window.chrome = cloneInto({}, window);
-_window.navigator.presentation = cloneInto({}, window);
-
-
-/**
- * Replace the src property setter on <script> elements to
- * intercept the new value.
- *
- * If it matches one of Chrome's cast extension sender script
- * URLs, replace it with the standard API URL, the request for
- * which is handled in the main script.
- */
-const { get, set } = Reflect.getOwnPropertyDescriptor(
-        HTMLScriptElement.prototype.wrappedJSObject, "src");
-
-Reflect.defineProperty(
-        HTMLScriptElement.prototype.wrappedJSObject, "src", {
-
-    configurable: true
-  , enumerable: true
-  , get
-
-  , set: exportFunction(function (value) {
-        if (CAST_SCRIPT_URLS.includes(value)) {
-            return set.call(this, CAST_LOADER_SCRIPT_URL);
-        }
-
-        return set.call(this, value);
-    }, window)
-});

ext/src/shim/export.ts

@@ -4,7 +4,7 @@ import * as cast from "./cast";
 
 import { BridgeInfo } from "../lib/getBridgeInfo";
 import { Message } from "../types";
-import { onMessage } from "./messageBridge";
+import { onMessage } from "./eventMessageChannel";
 
 
 /**
@@ -18,7 +18,7 @@ export function init (): Promise<BridgeInfo> {
     return new Promise(async (resolve, reject) => {
 
         // Trigger message port setup side-effects
-        import("./content");
+        import("./contentBridge");
 
         onMessage(message => {
             switch (message.subject) {

ext/src/shim/framework/index.ts

@@ -28,7 +28,7 @@ import { ActiveInputState
 
 import GoogleCastLauncher from "./GoogleCastLauncher";
 
-import { onMessage } from "../messageBridge";
+import { onMessage } from "../eventMessageChannel";
 
 
 export default {

ext/src/shim/index.ts

@@ -4,7 +4,7 @@ import * as cast from "./cast";
 
 import { CAST_FRAMEWORK_SCRIPT_URL } from "../endpoints";
 import { loadScript } from "../lib/utils";
-import { onMessage } from "./messageBridge";
+import { onMessage } from "./eventMessageChannel";
 
 
 const _window = (window as any);
@@ -47,6 +47,12 @@ if (document.currentScript) {
 
         isFramework = true;
 
+        /**
+         * Framework API library requires webcomponents for the cast
+         * button custom element (<google-cast-launcher>).
+         */
+        loadScript(browser.runtime.getURL("vendor/webcomponents-lite.js"));
+
         const script = loadScript(CAST_FRAMEWORK_SCRIPT_URL);
         script.addEventListener("load", ev => {
             callPageReadyFunction();