fix epic games helper

changelog.md

@@ -1,3 +1,13 @@
+# 2.0.9
+
+## Ext
+
+- Fix EpicGames helper
+
+## Node
+
+- Fix EpicGames helper
+
 # 2.0.8
 
 ## Ext

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vot.js",
-  "version": "2.0.8",
+  "version": "2.0.9",
   "author": "Toil",
   "repository": {
     "type": "git",

packages/core/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vot.js/core",
   "description": "core package",
-  "version": "2.0.8",
+  "version": "2.0.9",
   "author": "Toil",
   "license": "MIT",
   "repository": {

packages/ext/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vot.js/ext",
   "description": "package for web extensions",
-  "version": "2.0.8",
+  "version": "2.0.9",
   "author": "Toil",
   "license": "MIT",
   "repository": {

packages/ext/src/helpers/epicgames.ts

@@ -25,26 +25,76 @@ export default class EpicGamesHelper extends BaseHelper {
     }
   }
 
+  getVideoBlock() {
+    const videoUrlRe = /videoUrl\s?=\s"([^"]+)"?/;
+    const script = Array.from(document.body.querySelectorAll("script")).find(
+      (s) => videoUrlRe.exec(s.innerHTML),
+    );
+    if (!script) {
+      return undefined;
+    }
+
+    const content = script.innerHTML.trim();
+    const playlistUrl = videoUrlRe
+      .exec(content)?.[1]
+      ?.replace("qsep://", "https://");
+    if (!playlistUrl) {
+      return undefined;
+    }
+
+    let subtitlesString = /sources\s?=\s(\[([^\]]+)\])?/.exec(content)?.[1];
+    if (!subtitlesString) {
+      return {
+        playlistUrl,
+        subtitles: [],
+      };
+    }
+
+    try {
+      subtitlesString = (
+        subtitlesString
+          .replace(/src:(\s)+?(videoUrl)/g, 'src:"removed"')
+          .substring(0, subtitlesString.lastIndexOf("},")) + "]"
+      )
+        .split("\n")
+        .map((line) => line.replace(/([^\s]+):\s?(?!.*\1)/, '"$1":'))
+        .join("\n");
+      const subtitlesObj = JSON.parse(
+        subtitlesString,
+      ) as EpicGames.VideoSources[];
+      const subtitles = subtitlesObj.filter((sub) => sub.type === "captions");
+
+      return {
+        playlistUrl,
+        subtitles,
+      };
+    } catch {
+      return {
+        playlistUrl,
+        subtitles: [],
+      };
+    }
+  }
+
   async getVideoData(videoId: string): Promise<MinimalVideoData | undefined> {
     const postInfo = await this.getPostInfo(videoId);
     if (!postInfo) {
       return undefined;
     }
 
-    const videoBlock = postInfo.blocks.find((block) => block.type === "video");
-    const playlistUrl = videoBlock?.video_url?.replace("qsep://", "https://");
-    if (!playlistUrl) {
+    const videoBlock = this.getVideoBlock();
+    if (!videoBlock) {
       return undefined;
     }
 
+    const { playlistUrl, subtitles: videoSubtitles } = videoBlock;
     const { title, description } = postInfo;
-    const subtitles: VideoDataSubtitle[] | undefined =
-      videoBlock?.video_captions?.map((caption) => ({
-        language: normalizeLang(caption.locale),
-        source: "epicgames",
-        format: "vtt",
-        url: caption.signed_url,
-      }));
+    const subtitles: VideoDataSubtitle[] = videoSubtitles.map((caption) => ({
+      language: normalizeLang(caption.srclang),
+      source: "epicgames",
+      format: "vtt",
+      url: caption.src,
+    }));
 
     // url returns a json containing a dash playlist (in base64) in the playlist field
     return {
@@ -55,8 +105,22 @@ export default class EpicGamesHelper extends BaseHelper {
     };
   }
 
-  // eslint-disable-next-line @typescript-eslint/require-await
-  async getVideoId(url: URL) {
-    return /\/(\w{3,5})\/[^/]+$/.exec(url.pathname)?.[1];
+  async getVideoId(url: URL): Promise<string | undefined> {
+    return new Promise((resolve) => {
+      const origin = "https://dev.epicgames.com";
+      window.addEventListener("message", (e) => {
+        if (e.origin !== origin) {
+          return undefined;
+        }
+
+        if (typeof e.data === "string" && e.data.startsWith("getVideoId:")) {
+          const videoId = e.data.replace("getVideoId:", "");
+          return resolve(videoId);
+        }
+
+        return undefined;
+      });
+      window.top!.postMessage("getVideoId", origin);
+    });
   }
 }

packages/ext/src/helpers/nineanimetv.ts

@@ -144,10 +144,8 @@ export default class NineAnimeTVHelper extends BaseHelper {
           return undefined;
         }
 
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
-        if (e.data?.startsWith("getVideoId:")) {
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
-          const videoId = e.data.replace("getVideoId:", "") as string;
+        if (typeof e.data === "string" && e.data.startsWith("getVideoId:")) {
+          const videoId = e.data.replace("getVideoId:", "");
           return resolve(videoId);
         }
 

packages/node/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vot.js/node",
   "description": "package for runtimes",
-  "version": "2.0.8",
+  "version": "2.0.9",
   "author": "Toil",
   "license": "MIT",
   "repository": {

packages/node/src/helpers/epicgames.ts

@@ -25,35 +25,47 @@ export default class EpicGamesHelper extends BaseHelper {
     }
   }
 
+  async fetchPlaylistUrl(embedId: string) {
+    try {
+      const res = await this.fetch(
+        `https://dev.epicgames.com/community/api/cms/videos/${embedId}/embed.html`,
+      );
+      const content = await res.text();
+      const playlistUrl = /videoUrl\s?=\s"([^"]+)"?/.exec(content);
+      return playlistUrl?.[1]?.replace("qsep://", "https://");
+    } catch (err) {
+      Logger.error(
+        `Failed to get playlist url by embed Id ${embedId}, because: ${
+          (err as Error).message
+        }`,
+      );
+      return undefined;
+    }
+  }
+
   async getVideoData(videoId: string): Promise<MinimalVideoData | undefined> {
     const postInfo = await this.getPostInfo(videoId);
     if (!postInfo) {
       return undefined;
     }
 
     const videoBlock = postInfo.blocks.find((block) => block.type === "video");
-    const playlistUrl = videoBlock?.video_url?.replace("qsep://", "https://");
+    if (!videoBlock) {
+      return undefined;
+    }
+
+    const playlistUrl = await this.fetchPlaylistUrl(videoBlock.video_id);
     if (!playlistUrl) {
       return undefined;
     }
 
     const { title, description } = postInfo;
-    const subtitles = videoBlock?.video_captions?.map(
-      (caption) =>
-        ({
-          language: normalizeLang(caption.locale),
-          source: "epicgames",
-          format: "vtt",
-          url: caption.signed_url,
-        }) as VideoDataSubtitle,
-    );
 
     // url returns a json containing a dash playlist (in base64) in the playlist field
     return {
       url: playlistUrl,
       title,
       description,
-      subtitles,
     };
   }
 

packages/shared/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vot.js/shared",
   "description": "shared for all @vot.js package",
-  "version": "2.0.8",
+  "version": "2.0.9",
   "author": "Toil",
   "license": "MIT",
   "repository": {

packages/shared/src/data/config.ts

@@ -14,5 +14,5 @@ export default {
   defaultDuration: 343,
   minChunkSize: 5295308,
   loggerLevel: 1,
-  version: "2.0.8",
+  version: "2.0.9",
 } as ConfigSchema;

packages/shared/src/types/helpers/epicgames.ts

@@ -1,17 +1,22 @@
 export type VideoCaption = {
-  signed_url: string;
-  locale: string; // en-us
+  srclang: string;
+  type: "captions";
+  src: string;
 };
 
+export type VideoSources =
+  | VideoCaption
+  | {
+      src: string;
+      type: "quicksilver";
+    };
+
 export type VideoBlock = {
   type: "video";
   video_id: string;
   provider: string;
   caption: string;
   autoplay: boolean;
-  video_url: string; // startswith qsep://
-  video_captions: VideoCaption[];
-  video_thumbnail_large_url: string;
 };
 
 export type Link = {
@@ -33,6 +38,6 @@ export type Post = {
   title: string;
   description: string;
   locale: string; // en-us
-  blocks: [VideoBlock, LinkGroupBlock];
+  blocks: [VideoBlock, LinkGroupBlock]; // now useless
   status: "published";
 };