From 31757bb775378899cebe9aa3c291cead5e0264a0 Mon Sep 17 00:00:00 2001
From: hensm <m@matt.tf>
Date: Fri, 15 Apr 2022 23:48:47 +0100
Subject: [PATCH] Fix framework API script load order

---
 ext/src/cast/index.ts | 42 +++++++++++++++++++-----------------------
 ext/src/lib/utils.ts  | 15 +++++++++------
 2 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/ext/src/cast/index.ts b/ext/src/cast/index.ts
index 3c1e0bb..33a87b3 100644
--- a/ext/src/cast/index.ts
+++ b/ext/src/cast/index.ts
@@ -1,6 +1,7 @@
 "use strict";
 
 import * as cast from "./api";
+import logger from "../lib/logger";
 
 import { CAST_FRAMEWORK_SCRIPT_URL } from "../lib/endpoints";
 import { loadScript } from "../lib/utils";
@@ -18,14 +19,6 @@ _window.chrome.cast = cast;
 let bridgeInfo: any;
 let isFramework = false;
 
-// Call page's API loaded function if defined
-function callPageReadyFunction() {
-    const readyFunction = _window.__onGCastApiAvailable;
-    if (readyFunction && typeof readyFunction === "function") {
-        readyFunction(bridgeInfo && bridgeInfo.isVersionCompatible);
-    }
-}
-
 /**
  * If loaded within a page via a <script> element,
  * document.currentScript should exist and we can check its
@@ -42,29 +35,32 @@ if (document.currentScript) {
             _window.cast = {};
         }
 
+        /**
+         * Set isFramework flag to load framework once the base cast API is
+         * initialized
+         */
         isFramework = true;
-
-        const script = loadScript(CAST_FRAMEWORK_SCRIPT_URL);
-        script.addEventListener("load", () => {
-            callPageReadyFunction();
-        });
-
-        /*
-        // TODO: Finish cast.framework and replace Google's implementation
-        import("./framework").then(framework => {
-            _window.cast.framework = framework.default;
-        });
-        */
     }
 }
 
-onMessage(message => {
+onMessage(async message => {
     switch (message.subject) {
         case "cast:initialized": {
             bridgeInfo = message.data;
 
-            if (!isFramework) {
-                callPageReadyFunction();
+            // If framework API is requested, load that first
+            if (isFramework) {
+                try {
+                    await loadScript(CAST_FRAMEWORK_SCRIPT_URL);
+                } catch (err) {
+                    logger.error("Failed to load CAF script!");
+                }
+            }
+            
+            // Call page script/framework API script's init function
+            const initFn = _window.__onGCastApiAvailable;
+            if (initFn && typeof initFn === "function") {
+                initFn(bridgeInfo && bridgeInfo.isVersionCompatible);
             }
 
             break;
diff --git a/ext/src/lib/utils.ts b/ext/src/lib/utils.ts
index 76a52fb..8211435 100644
--- a/ext/src/lib/utils.ts
+++ b/ext/src/lib/utils.ts
@@ -117,10 +117,13 @@ export const REMOTE_MATCH_PATTERN_REGEX =
 export function loadScript(
     scriptUrl: string,
     doc: Document = document
-): HTMLScriptElement {
-    const scriptElement = doc.createElement("script");
-    scriptElement.src = scriptUrl;
-    (doc.head || doc.documentElement).append(scriptElement);
-
-    return scriptElement;
+): Promise<HTMLScriptElement> {
+    return new Promise((resolve, reject) => {
+        const scriptEl = doc.createElement("script");
+        scriptEl.src = scriptUrl;
+        (doc.head || doc.documentElement).append(scriptEl);
+    
+        scriptEl.addEventListener("load", () => resolve(scriptEl));
+        scriptEl.addEventListener("error", () => reject());
+    });
 }