Merge branch 'master' of github.com:LiveTL/HyperChat

LiveTL · May 6, 2022 · 1936416 · 1936416
2 parents c03fe60 + 4880742
commit 1936416
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 7 deletions.
diff --git a/src/components/Hyperchat.svelte b/src/components/Hyperchat.svelte
@@ -167,6 +167,8 @@
       case 'themeUpdate':
         ytDark = response.dark;
         break;
+      case 'registerClientResponse':
+        break;
       default:
         console.error('Unknown payload type', { port, response });
         break;

diff --git a/src/components/changelog/Changelog.svelte b/src/components/changelog/Changelog.svelte
@@ -9,7 +9,7 @@
     broken when using HyperChat with LiveTL
   </li>
   <li class="ml-3.5">
-    Fixed issues with the chat freezing or clearning
+    Fixed issues with the chat freezing or clearing
     when watching VODs
   </li>
   <li class="ml-3.5">

diff --git a/src/scripts/chat-background.ts b/src/scripts/chat-background.ts
@@ -156,13 +156,29 @@ const registerClient = (
     frameInfo,
     { interceptors, port, frameInfo }
   );
-  if (!interceptor) return;
+  if (!interceptor) {
+    port.postMessage(
+      {
+        type: 'registerClientResponse',
+        success: false,
+        failReason: 'Interceptor not found'
+      }
+    );
+    return;
+  }
 
   if (interceptor.clients.some((client) => client.name === port.name)) {
     console.debug(
       'Client already registered. Not registering',
       { interceptors, port, frameInfo }
     );
+    port.postMessage(
+      {
+        type: 'registerClientResponse',
+        success: false,
+        failReason: 'Client already registered'
+      }
+    );
     return;
   }
 
@@ -187,6 +203,12 @@ const registerClient = (
   // Add client to array
   interceptor.clients.push(port);
   console.debug('Register client successful', { port, interceptor });
+  port.postMessage(
+    {
+      type: 'registerClientResponse',
+      success: true
+    }
+  );
 
   if (getInitialData && isYtcInterceptor(interceptor)) {
     const payload = {

diff --git a/src/scripts/chat-injector.ts b/src/scripts/chat-injector.ts
@@ -93,6 +93,10 @@ const chatLoaded = async (): Promise<void> => {
   }
 };
 
-setTimeout(() => {
+if (isLiveTL) {
   chatLoaded().catch(console.error);
-}, isLiveTL ? 0 : 500);
+} else {
+  setTimeout(() => {
+    chatLoaded().catch(console.error);
+  }, 500);
+}
diff --git a/src/scripts/chat-interceptor.ts b/src/scripts/chat-interceptor.ts
@@ -110,6 +110,10 @@ const chatLoaded = async (): Promise<void> => {
   document.body.appendChild(fixLeakScript);
 };
 
-setTimeout(() => {
+if (isLiveTL) {
   chatLoaded().catch(console.error);
-}, isLiveTL ? 0 : 500);
+} else {
+  setTimeout(() => {
+    chatLoaded().catch(console.error);
+  }, 500);
+}
diff --git a/src/ts/typings/chat.d.ts b/src/ts/typings/chat.d.ts
@@ -61,7 +61,13 @@ declare namespace Chat {
     message: LtlMessage;
   }
 
-  type BackgroundResponse = Actions | InitialData | ThemeUpdate | LtlMessageResponse;
+  interface registerClientResponse {
+    type: 'registerClientResponse';
+    success: boolean;
+    failReason?: string;
+  }
+
+  type BackgroundResponse = Actions | InitialData | ThemeUpdate | LtlMessageResponse | registerClientResponse;
 
   type InterceptorSource = 'ytc' | 'ltlMessage';