From c217f6cde1ba9e4e009b6feba11c90db25e14a9f Mon Sep 17 00:00:00 2001
From: hensm <m@matt.tf>
Date: Sat, 16 Apr 2022 03:53:41 +0100
Subject: [PATCH] Load framework API script earlier to speed up cast init

---
 ext/src/cast/index.ts | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/ext/src/cast/index.ts b/ext/src/cast/index.ts
index 33a87b3..42f20c7 100644
--- a/ext/src/cast/index.ts
+++ b/ext/src/cast/index.ts
@@ -17,7 +17,7 @@ if (!_window.chrome) {
 _window.chrome.cast = cast;
 
 let bridgeInfo: any;
-let isFramework = false;
+let frameworkScriptPromise: Promise<HTMLScriptElement>;
 
 /**
  * If loaded within a page via a <script> element,
@@ -35,11 +35,11 @@ if (document.currentScript) {
             _window.cast = {};
         }
 
-        /**
-         * Set isFramework flag to load framework once the base cast API is
-         * initialized
-         */
-        isFramework = true;
+        // Queue up the framework script load to speed up init
+         frameworkScriptPromise = loadScript(CAST_FRAMEWORK_SCRIPT_URL);
+         frameworkScriptPromise.catch(() => {
+             logger.error("Failed to load CAF script!");
+         });
     }
 }
 
@@ -48,13 +48,9 @@ onMessage(async message => {
         case "cast:initialized": {
             bridgeInfo = message.data;
 
-            // 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!");
-                }
+            // If framework API is requested, ensure loaded
+            if (frameworkScriptPromise) {
+                await frameworkScriptPromise;
             }
             
             // Call page script/framework API script's init function