Merge pull request #97 from etherfun/dev_0

Update windowMessageListener
hanydd · Dec 1, 2024 · 5477069 · 5477069
2 parents eca1405 + 9d1c141
commit 5477069
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/src/document.ts b/src/document.ts
@@ -11,6 +11,26 @@ const sendMessageToContent = (messageData: InjectedScriptMessageSend, payload):
         "/"
     );
 };
+let frameRate: number = 30;
+
+(function () {
+    const originalFetch = window.fetch;
+
+    window.fetch = async function (input, init) {
+        const url = typeof input === 'string' ? input : (input as Request).url;
+
+        const response = await originalFetch(input, init);
+        if (url.includes('/player/wbi/playurl') && url.includes(window.__INITIAL_STATE__.cid.toString())) {
+            response.clone().json().then(data => {
+                frameRate = data.data.dash.video
+                    .filter((v) => v.id === data.data.quality && v.codecid === data.data.video_codecid)[0]?.frameRate;
+            }).catch(() => {
+                frameRate = 30;
+            });
+        }
+        return response;
+    };
+})();
 
 function windowMessageListener(message: MessageEvent) {
     const data: InjectedScriptMessageSend = message.data;
@@ -21,12 +41,9 @@ function windowMessageListener(message: MessageEvent) {
         if (data.type === "getBvID") {
             sendMessageToContent(data, window?.__INITIAL_STATE__?.bvid);
         } else if (data.type === "getFrameRate") {
-            const currentQuality = window?.__playinfo__?.data?.quality;
-            const frameRate = window?.__playinfo__?.data?.dash?.video.filter((v) => v.id === currentQuality)[0]
-                ?.frameRate;
             sendMessageToContent(data, frameRate);
         } else if (data.type === "getChannelID") {
-            sendMessageToContent(data, window?.__INITIAL_STATE__?.upInfo?.mid);
+            sendMessageToContent(data, window?.__INITIAL_STATE__?.upData?.mid);
         } else if (data.type === "getDescription") {
             sendMessageToContent(data, window?.__INITIAL_STATE__?.videoData?.desc);
         }

diff --git a/src/globals.d.ts b/src/globals.d.ts
@@ -2,7 +2,6 @@ import SBObject from "./config";
 declare global {
     interface Window {
         SB: typeof SBObject;
-        __INITIAL_STATE__?: { bvid: string; upInfo: { mid: number }; videoData: { desc: string } };
-        __playinfo__?: { data: { quality: number; dash: { video: { id: number; frameRate: number }[] } } };
+        __INITIAL_STATE__?: { bvid: string; aid: number; cid: number; upData: { mid: string }; videoData: { desc: string }};
     }
 }