Fix #319

src/page/getFetch.ts

@@ -46,10 +46,10 @@ export function getFetch(pageState: PageState): typeof fetch {
             type: MessageType.NewPlaybackAccessTokenResponse,
             newPlaybackAccessToken,
           };
-          pageState.twitchWorker?.postMessage({
+          pageState.sendMessageToWorkerScripts(
-            type: MessageType.WorkerScriptMessage,
+            pageState.twitchWorkers,
-            message,
+            message
-          });
+          );
           break;
       }
     });

src/page/page.ts

@@ -7,8 +7,8 @@ import {
   getSendMessageToContentScriptAndWaitForResponse,
   getSendMessageToPageScript,
   getSendMessageToPageScriptAndWaitForResponse,
-  getSendMessageToWorkerScript,
+  getSendMessageToWorkerScripts,
-  getSendMessageToWorkerScriptAndWaitForResponse,
+  getSendMessageToWorkerScriptsAndWaitForResponse,
 } from "./sendMessage";
 import type { PageState } from "./types";
 
@@ -22,21 +22,21 @@ const sendMessageToContentScriptAndWaitForResponse =
 const sendMessageToPageScript = getSendMessageToPageScript();
 const sendMessageToPageScriptAndWaitForResponse =
   getSendMessageToPageScriptAndWaitForResponse();
-const sendMessageToWorkerScript = getSendMessageToWorkerScript();
+const sendMessageToWorkerScripts = getSendMessageToWorkerScripts();
-const sendMessageToWorkerScriptAndWaitForResponse =
+const sendMessageToWorkerScriptsAndWaitForResponse =
-  getSendMessageToWorkerScriptAndWaitForResponse();
+  getSendMessageToWorkerScriptsAndWaitForResponse();
 
 const pageState: PageState = {
   isChromium: params.isChromium,
   scope: "page",
   state: undefined,
-  twitchWorker: undefined,
+  twitchWorkers: [],
   sendMessageToContentScript,
   sendMessageToContentScriptAndWaitForResponse,
   sendMessageToPageScript,
   sendMessageToPageScriptAndWaitForResponse,
-  sendMessageToWorkerScript,
+  sendMessageToWorkerScripts,
-  sendMessageToWorkerScriptAndWaitForResponse,
+  sendMessageToWorkerScriptsAndWaitForResponse,
 };
 
 const NATIVE_FETCH = window.fetch;
@@ -94,7 +94,7 @@ window.Worker = class Worker extends window.Worker {
       new Blob([wrapperScript], { type: "text/javascript" })
     );
     super(wrapperScriptURL, options);
-    pageState.twitchWorker = this;
+    pageState.twitchWorkers.push(this);
     this.addEventListener("message", event => {
       if (
         event.data?.type === MessageType.ContentScriptMessage ||
@@ -112,7 +112,7 @@ let sendStoreStateToWorker = false;
 window.addEventListener("message", event => {
   // Relay messages from the content script to the worker script.
   if (event.data?.type === MessageType.WorkerScriptMessage) {
-    sendMessageToWorkerScript(pageState.twitchWorker, event.data.message);
+    sendMessageToWorkerScripts(pageState.twitchWorkers, event.data.message);
     return;
   }
 
@@ -124,7 +124,7 @@ window.addEventListener("message", event => {
   switch (message.type) {
     case MessageType.GetStoreState: // From Worker
       if (pageState.state != null) {
-        sendMessageToWorkerScript(pageState.twitchWorker, {
+        sendMessageToWorkerScripts(pageState.twitchWorkers, {
           type: MessageType.GetStoreStateResponse,
           state: pageState.state,
         });
@@ -142,7 +142,7 @@ window.addEventListener("message", event => {
       const state = message.state;
       pageState.state = state;
       if (sendStoreStateToWorker) {
-        sendMessageToWorkerScript(pageState.twitchWorker, {
+        sendMessageToWorkerScripts(pageState.twitchWorkers, {
           type: MessageType.GetStoreStateResponse,
           state,
         });
@@ -211,7 +211,7 @@ onChannelChange((_channelName, oldChannelName) => {
     type: MessageType.ClearStats,
     channelName: oldChannelName,
   });
-  sendMessageToWorkerScript(pageState.twitchWorker, {
+  sendMessageToWorkerScripts(pageState.twitchWorkers, {
     type: MessageType.ClearStats,
     channelName: oldChannelName,
   });

src/page/sendMessage.ts

@@ -1,9 +1,9 @@
 import { MessageType } from "../types";
 import type {
   SendMessageAndWaitForResponseFn,
-  SendMessageAndWaitForResponseWorkerFn,
+  SendMessageAndWaitForResponseWorkersFn,
   SendMessageFn,
-  SendMessageWorkerFn,
+  SendMessageWorkersFn,
 } from "./types";
 
 // TODO: Secure communication between content, page, and worker scripts.
@@ -104,28 +104,34 @@ export function getSendMessageToPageScriptAndWaitForResponse(): SendMessageAndWa
   };
 }
 
-export function getSendMessageToWorkerScript(): SendMessageWorkerFn {
+export function getSendMessageToWorkerScripts(): SendMessageWorkersFn {
-  return (worker: Worker | undefined, message: any) =>
+  return (workers: Worker[], message: any) =>
-    sendMessage(worker, MessageType.WorkerScriptMessage, message);
+    workers.forEach(worker =>
+      sendMessage(worker, MessageType.WorkerScriptMessage, message)
+    );
 }
 
-export function getSendMessageToWorkerScriptAndWaitForResponse(): SendMessageAndWaitForResponseWorkerFn {
+export function getSendMessageToWorkerScriptsAndWaitForResponse(): SendMessageAndWaitForResponseWorkersFn {
   return async (
-    worker: Worker | undefined,
+    workers: Worker[],
     message: any,
     responseMessageType: MessageType,
     scope: "page" | "worker",
     responseTimeout: number = 5000
   ) => {
-    return sendMessageAndWaitForResponse(
+    return Promise.any(
-      worker,
+      workers.map(worker =>
-      MessageType.WorkerScriptMessage,
+        sendMessageAndWaitForResponse(
-      message,
+          worker,
-      scope === "page"
+          MessageType.WorkerScriptMessage,
-        ? MessageType.PageScriptMessage
+          message,
-        : MessageType.WorkerScriptMessage,
+          scope === "page"
-      responseMessageType,
+            ? MessageType.PageScriptMessage
-      responseTimeout
+            : MessageType.WorkerScriptMessage,
+          responseMessageType,
+          responseTimeout
+        )
+      )
     );
   };
 }

src/page/types.ts

@@ -2,18 +2,15 @@ import type { State } from "../store/types";
 import { MessageType } from "../types";
 
 export type SendMessageFn = (message: any) => void;
-export type SendMessageWorkerFn = (
+export type SendMessageWorkersFn = (workers: Worker[], message: any) => void;
-  worker: Worker | undefined,
-  message: any
-) => void;
 export type SendMessageAndWaitForResponseFn = (
   scope: "page" | "worker",
   message: any,
   responseMessageType: MessageType,
   responseTimeout?: number
 ) => Promise<any>;
-export type SendMessageAndWaitForResponseWorkerFn = (
+export type SendMessageAndWaitForResponseWorkersFn = (
-  worker: Worker | undefined,
+  workers: Worker[],
   message: any,
   responseMessageType: MessageType,
   scope: "page" | "worker",
@@ -24,13 +21,13 @@ export interface PageState {
   isChromium: boolean;
   scope: "page" | "worker";
   state?: State;
-  twitchWorker?: Worker;
+  twitchWorkers: Worker[];
   sendMessageToContentScript: SendMessageFn;
   sendMessageToContentScriptAndWaitForResponse: SendMessageAndWaitForResponseFn;
   sendMessageToPageScript: SendMessageFn;
   sendMessageToPageScriptAndWaitForResponse: SendMessageAndWaitForResponseFn;
-  sendMessageToWorkerScript: SendMessageWorkerFn;
+  sendMessageToWorkerScripts: SendMessageWorkersFn;
-  sendMessageToWorkerScriptAndWaitForResponse: SendMessageAndWaitForResponseWorkerFn;
+  sendMessageToWorkerScriptsAndWaitForResponse: SendMessageAndWaitForResponseWorkersFn;
 }
 
 export interface UsherManifest {

src/page/worker.ts

@@ -5,8 +5,8 @@ import {
   getSendMessageToContentScriptAndWaitForResponse,
   getSendMessageToPageScript,
   getSendMessageToPageScriptAndWaitForResponse,
-  getSendMessageToWorkerScript,
+  getSendMessageToWorkerScripts,
-  getSendMessageToWorkerScriptAndWaitForResponse,
+  getSendMessageToWorkerScriptsAndWaitForResponse,
 } from "./sendMessage";
 import type { PageState } from "./types";
 
@@ -27,21 +27,22 @@ const sendMessageToContentScriptAndWaitForResponse =
 const sendMessageToPageScript = getSendMessageToPageScript();
 const sendMessageToPageScriptAndWaitForResponse =
   getSendMessageToPageScriptAndWaitForResponse();
-const sendMessageToWorkerScript = getSendMessageToWorkerScript();
+const sendMessageToWorkerScript = getSendMessageToWorkerScripts();
 const sendMessageToWorkerScriptAndWaitForResponse =
-  getSendMessageToWorkerScriptAndWaitForResponse();
+  getSendMessageToWorkerScriptsAndWaitForResponse();
 
 const pageState: PageState = {
   isChromium: params.isChromium,
   scope: "worker",
   state: undefined,
-  twitchWorker: undefined, // Can't get the worker instance from inside the worker.
+  twitchWorkers: [], // FIXME: Always empty in workers. (Could be problematic for Usher manifests in Worker)
   sendMessageToContentScript,
   sendMessageToContentScriptAndWaitForResponse,
   sendMessageToPageScript,
   sendMessageToPageScriptAndWaitForResponse,
-  sendMessageToWorkerScript,
+  sendMessageToWorkerScripts: sendMessageToWorkerScript,
-  sendMessageToWorkerScriptAndWaitForResponse,
+  sendMessageToWorkerScriptsAndWaitForResponse:
+    sendMessageToWorkerScriptAndWaitForResponse,
 };
 
 self.fetch = getFetch(pageState);

tsconfig.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "ES2020",
+    "target": "ES2021",
     "moduleResolution": "Node",
     "allowSyntheticDefaultImports": true,
     "noEmit": true,