port providers, media watch page + make search work again

Co-authored-by: James Hawkins <jhawki2005@gmail.com>

src/backend/embeds/.gitkeep

@@ -0,0 +1 @@
+embed scrapers go here

src/backend/embeds/testEmbedScraper.ts

@@ -1,30 +0,0 @@
-import { MWEmbedType } from "../helpers/embed";
-import { registerEmbedScraper } from "../helpers/register";
-import { MWStreamQuality, MWStreamType } from "../helpers/streams";
-
-const timeout = (time: number) =>
-  new Promise<void>((resolve) => {
-    setTimeout(() => resolve(), time);
-  });
-
-registerEmbedScraper({
-  id: "testembed",
-  rank: 23,
-  for: MWEmbedType.OPENLOAD,
-
-  async getStream({ progress }) {
-    await timeout(1000);
-    progress(25);
-    await timeout(1000);
-    progress(50);
-    await timeout(1000);
-    progress(75);
-    throw new Error("failed to load or something");
-    await timeout(1000);
-    return {
-      streamUrl: "hello-world",
-      type: MWStreamType.MP4,
-      quality: MWStreamQuality.Q1080P,
-    };
-  },
-});

src/backend/embeds/testEmbedScraperTwo.ts

@@ -1,24 +0,0 @@
-import { MWEmbedType } from "../helpers/embed";
-import { registerEmbedScraper } from "../helpers/register";
-import { MWStreamQuality, MWStreamType } from "../helpers/streams";
-
-const timeout = (time: number) =>
-  new Promise<void>((resolve) => {
-    setTimeout(() => resolve(), time);
-  });
-
-registerEmbedScraper({
-  id: "testembedtwo",
-  rank: 19,
-  for: MWEmbedType.ANOTHER,
-
-  async getStream({ progress }) {
-    progress(75);
-    await timeout(1000);
-    return {
-      streamUrl: "hello-world-5",
-      type: MWStreamType.MP4,
-      quality: MWStreamQuality.Q1080P,
-    };
-  },
-});

src/backend/helpers/provider.ts

@@ -1,3 +1,4 @@
+import { DetailedMeta } from "../metadata/getmeta";
 import { MWMediaType } from "../metadata/types";
 import { MWEmbed } from "./embed";
 import { MWStream } from "./streams";
@@ -9,8 +10,7 @@ export type MWProviderScrapeResult = {
 
 export type MWProviderContext = {
   progress(percentage: number): void;
-  imdbId: string;
+  media: DetailedMeta;
-  tmdbId: string;
 };
 
 export type MWProvider = {

src/backend/helpers/run.ts

@@ -28,7 +28,7 @@ export async function runProvider(
     const data = await provider.scrape(ctx);
     return sortProviderResult(data);
   } catch (err) {
-    console.error("Failed to run provider", {
+    console.error("Failed to run provider", err, {
       id: provider.id,
       ctx: { ...ctx },
     });

src/backend/helpers/scrape.ts

@@ -2,6 +2,7 @@ import { MWProviderScrapeResult } from "./provider";
 import { getEmbedScraperByType, getProviders } from "./register";
 import { runEmbedScraper, runProvider } from "./run";
 import { MWStream } from "./streams";
+import { DetailedMeta } from "../metadata/getmeta";
 
 interface MWProgressData {
   type: "embed" | "provider";
@@ -15,8 +16,7 @@ interface MWNextData {
 }
 
 export interface MWProviderRunContext {
-  tmdb: string;
+  media: DetailedMeta;
-  imdb: string;
   onProgress?: (data: MWProgressData) => void;
   onNext?: (data: MWNextData) => void;
 }
@@ -80,8 +80,7 @@ export async function findBestStream(
     let result: MWProviderScrapeResult;
     try {
       result = await runProvider(provider, {
-        imdbId: ctx.imdb,
+        media: ctx.media,
-        tmdbId: ctx.tmdb,
         progress(num) {
           ctx.onProgress?.({
             percentage: num,

src/backend/helpers/streams.ts

@@ -5,7 +5,9 @@ export enum MWStreamType {
 
 export enum MWStreamQuality {
   Q360P = "360p",
+  Q720P = "720p",
   Q1080P = "1080p",
+  QUNKNOWN = "unknown",
 }
 
 export type MWStream = {

src/backend/index.ts

@@ -8,12 +8,9 @@ import { initializeScraperStore } from "./helpers/register";
 
 // providers
 // -- nothing here yet
-import "./providers/testProvider";
+import "./providers/gdriveplayer";
-import "./providers/testProviderTwo";
 
 // embeds
 // -- nothing here yet
-import "./embeds/testEmbedScraper";
-import "./embeds/testEmbedScraperTwo";
 
 initializeScraperStore();

src/backend/metadata/getmeta.ts

@@ -0,0 +1,61 @@
+import { formatJWMeta, JWMediaResult } from "./justwatch";
+import { MWMediaMeta, MWMediaType } from "./types";
+
+const JW_API_BASE = "https://apis.justwatch.com";
+
+// http://localhost:5173/#/media/movie-439596/
+
+type JWExternalIdType =
+  | "eidr"
+  | "imdb_latest"
+  | "imdb"
+  | "tmdb_latest"
+  | "tmdb"
+  | "tms";
+
+interface JWExternalId {
+  provider: JWExternalIdType;
+  external_id: string;
+}
+
+interface JWDetailedMeta extends JWMediaResult {
+  external_ids: JWExternalId[];
+}
+
+export interface DetailedMeta {
+  meta: MWMediaMeta;
+  tmdbId: string;
+  imdbId: string;
+}
+
+export async function getMetaFromId(
+  type: MWMediaType,
+  id: string
+): Promise<DetailedMeta> {
+  let queryType = "";
+  if (type === MWMediaType.MOVIE) queryType = "movie";
+  else if (type === MWMediaType.SERIES) queryType = "show";
+  else if (type === MWMediaType.ANIME)
+    throw new Error("Anime search type is not supported");
+
+  const data = await fetch(
+    `${JW_API_BASE}/content/titles/${queryType}/${encodeURIComponent(
+      id
+    )}/locale/en_US`
+  ).then((res) => res.json() as Promise<JWDetailedMeta>);
+
+  const imdbId = data.external_ids.find(
+    (v) => v.provider === "imdb_latest"
+  )?.external_id;
+  const tmdbId = data.external_ids.find(
+    (v) => v.provider === "tmdb_latest"
+  )?.external_id;
+
+  if (!imdbId || !tmdbId) throw new Error("not enough info");
+
+  return {
+    meta: formatJWMeta(data),
+    imdbId,
+    tmdbId,
+  };
+}

src/backend/metadata/justwatch.ts

@@ -0,0 +1,42 @@
+import { MWMediaType } from "./types";
+
+export const JW_API_BASE = "https://apis.justwatch.com";
+
+export type JWContentTypes = "movie" | "show";
+
+export type JWMediaResult = {
+  title: string;
+  poster?: string;
+  id: number;
+  original_release_year: number;
+  jw_entity_id: string;
+  object_type: JWContentTypes;
+};
+
+export function mediaTypeToJW(type: MWMediaType): JWContentTypes {
+  if (type === MWMediaType.MOVIE) return "movie";
+  if (type === MWMediaType.SERIES) return "show";
+  throw new Error("unsupported type");
+}
+
+export function JWMediaToMediaType(type: string): MWMediaType {
+  if (type === "movie") return MWMediaType.MOVIE;
+  if (type === "show") return MWMediaType.SERIES;
+  throw new Error("unsupported type");
+}
+
+export function formatJWMeta(media: JWMediaResult) {
+  const type = JWMediaToMediaType(media.object_type);
+  return {
+    title: media.title,
+    id: media.id.toString(),
+    year: media.original_release_year.toString(),
+    poster: media.poster
+      ? `https://images.justwatch.com${media.poster.replace(
+          "{profile}",
+          "s166"
+        )}`
+      : undefined,
+    type,
+  };
+}

src/backend/metadata/search.ts

@@ -1,9 +1,11 @@
+import {
+  formatJWMeta,
+  JWContentTypes,
+  JWMediaResult,
+  JW_API_BASE,
+} from "./justwatch";
 import { MWMediaMeta, MWMediaType, MWQuery } from "./types";
 
-const JW_API_BASE = "https://apis.justwatch.com";
-
-type JWContentTypes = "movie" | "show";
-
 type JWSearchQuery = {
   content_types: JWContentTypes[];
   page: number;
@@ -11,14 +13,6 @@ type JWSearchQuery = {
   query: string;
 };
 
-type JWSearchResults = {
-  title: string;
-  poster?: string;
-  id: number;
-  original_release_year: number;
-  jw_entity_id: string;
-};
-
 type JWPage<T> = {
   items: T[];
   page: number;
@@ -46,15 +40,7 @@ export async function searchForMedia({
     `${JW_API_BASE}/content/titles/en_US/popular?body=${encodeURIComponent(
       JSON.stringify(body)
     )}`
-  ).then((res) => res.json() as Promise<JWPage<JWSearchResults>>);
+  ).then((res) => res.json() as Promise<JWPage<JWMediaResult>>);
 
-  return data.items.map<MWMediaMeta>((v) => ({
+  return data.items.map<MWMediaMeta>((v) => formatJWMeta(v));
-    title: v.title,
-    id: v.id.toString(),
-    year: v.original_release_year.toString(),
-    poster: v.poster
-      ? `https://images.justwatch.com${v.poster.replace("{profile}", "s166")}`
-      : undefined,
-    type,
-  }));
 }

src/backend/providers/flixhq.ts

@@ -10,6 +10,7 @@ registerProvider({
   id: "testprov",
   rank: 42,
   type: [MWMediaType.MOVIE],
+  disabled: true,
 
   async scrape({ progress }) {
     await timeout(1000);

src/backend/providers/gdriveplayer.ts

@@ -0,0 +1,96 @@
+import { conf } from "@/setup/config";
+import { registerProvider } from "@/backend/helpers/register";
+import { MWMediaType } from "@/backend/metadata/types";
+import { MWStreamQuality } from "@/backend/helpers/streams";
+
+import { unpack } from "unpacker";
+import CryptoJS from "crypto-js";
+
+const format = {
+  stringify: (cipher: any) => {
+    const ct = cipher.ciphertext.toString(CryptoJS.enc.Base64);
+    const iv = cipher.iv.toString() || "";
+    const salt = cipher.salt.toString() || "";
+    return JSON.stringify({
+      ct,
+      iv,
+      salt,
+    });
+  },
+  parse: (jsonStr: string) => {
+    const json = JSON.parse(jsonStr);
+    const ciphertext = CryptoJS.enc.Base64.parse(json.ct);
+    const iv = CryptoJS.enc.Hex.parse(json.iv) || "";
+    const salt = CryptoJS.enc.Hex.parse(json.s) || "";
+
+    const cipher = CryptoJS.lib.CipherParams.create({
+      ciphertext,
+      iv,
+      salt,
+    });
+    return cipher;
+  },
+};
+
+registerProvider({
+  id: "gdriveplayer",
+  rank: 69,
+  type: [MWMediaType.MOVIE],
+
+  async scrape({ media: { imdbId } }) {
+    const streamRes = await fetch(
+      `${
+        conf().CORS_PROXY_URL
+      }https://database.gdriveplayer.us/player.php?imdb=${imdbId}`
+    ).then((d) => d.text());
+    const page = new DOMParser().parseFromString(streamRes, "text/html");
+
+    const script: HTMLElement | undefined = Array.from(
+      page.querySelectorAll("script")
+    ).find((e) => e.textContent?.includes("eval"));
+
+    if (!script || !script.textContent) {
+      throw new Error("Could not find stream");
+    }
+
+    /// NOTE: this code requires re-write, it's not safe
+    const data = unpack(script.textContent)
+      .split("var data=\\'")[1]
+      .split("\\'")[0]
+      .replace(/\\/g, "");
+    const decryptedData = unpack(
+      CryptoJS.AES.decrypt(
+        data,
+        "alsfheafsjklNIWORNiolNIOWNKLNXakjsfwnBdwjbwfkjbJjkopfjweopjASoiwnrflakefneiofrt",
+        { format }
+      ).toString(CryptoJS.enc.Utf8)
+    );
+    // eslint-disable-next-line
+    const sources = JSON.parse(
+      JSON.stringify(
+        eval(
+          decryptedData
+            .split("sources:")[1]
+            .split(",image")[0]
+            .replace(/\\/g, "")
+            .replace(/document\.referrer/g, '""')
+        )
+      )
+    );
+    const source = sources[sources.length - 1];
+    /// END
+
+    let quality;
+    if (source.label === "720p") quality = MWStreamQuality.Q720P;
+    else quality = MWStreamQuality.QUNKNOWN;
+
+    return {
+      stream: {
+        streamUrl: `https:${source.file}`,
+        type: source.type,
+        quality,
+      },
+      embeds: [],
+    };
+  },
+});

src/backend/providers/superstream/LICENSE

@@ -0,0 +1,680 @@
+Credit goes to @ImZaw and @Blatzar from https://github.com/recloudstream/cloudstream
+All files in the current directory (src/providers/list/superstream) are derived from https://github.com/recloudstream/cloudstream-extensions/blob/master/SuperStream/src/main/kotlin/com/lagradost/SuperStream.kt
+Below is the license associated with the source of the derived work.
+
+
+
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

src/backend/providers/superstream/superstream.ts

@@ -0,0 +1,205 @@
+import { registerProvider } from "@/backend/helpers/register";
+import { MWMediaType } from "@/backend/metadata/types";
+import { conf } from "@/setup/config";
+
+import { customAlphabet } from "nanoid";
+// import toWebVTT from "srt-webvtt";
+import CryptoJS from "crypto-js";
+
+const nanoid = customAlphabet("0123456789abcdef", 32);
+
+// CONSTANTS, read below (taken from og)
+// We do not want content scanners to notice this scraping going on so we've hidden all constants
+// The source has its origins in China so I added some extra security with banned words
+// Mayhaps a tiny bit unethical, but this source is just too good :)
+// If you are copying this code please use precautions so they do not change their api.
+const iv = atob("d0VpcGhUbiE=");
+const key = atob("MTIzZDZjZWRmNjI2ZHk1NDIzM2FhMXc2");
+const apiUrls = [
+  atob("aHR0cHM6Ly9zaG93Ym94LnNoZWd1Lm5ldC9hcGkvYXBpX2NsaWVudC9pbmRleC8="),
+  atob("aHR0cHM6Ly9tYnBhcGkuc2hlZ3UubmV0L2FwaS9hcGlfY2xpZW50L2luZGV4Lw=="),
+];
+const appKey = atob("bW92aWVib3g=");
+const appId = atob("Y29tLnRkby5zaG93Ym94");
+
+// cryptography stuff
+const crypto = {
+  encrypt(str: string) {
+    return CryptoJS.TripleDES.encrypt(str, CryptoJS.enc.Utf8.parse(key), {
+      iv: CryptoJS.enc.Utf8.parse(iv),
+    }).toString();
+  },
+  getVerify(str: string, str2: string, str3: string) {
+    if (str) {
+      return CryptoJS.MD5(
+        CryptoJS.MD5(str2).toString() + str3 + str
+      ).toString();
+    }
+    return null;
+  },
+};
+
+// get expire time
+const expiry = () => Math.floor(Date.now() / 1000 + 60 * 60 * 12);
+
+// sending requests
+const get = (data: object, altApi = false) => {
+  const defaultData = {
+    childmode: "0",
+    app_version: "11.5",
+    appid: appId,
+    lang: "en",
+    expired_date: `${expiry()}`,
+    platform: "android",
+    channel: "Website",
+  };
+  const encryptedData = crypto.encrypt(
+    JSON.stringify({
+      ...defaultData,
+      ...data,
+    })
+  );
+  const appKeyHash = CryptoJS.MD5(appKey).toString();
+  const verify = crypto.getVerify(encryptedData, appKey, key);
+  const body = JSON.stringify({
+    app_key: appKeyHash,
+    verify,
+    encrypt_data: encryptedData,
+  });
+  const b64Body = btoa(body);
+
+  const formatted = new URLSearchParams();
+  formatted.append("data", b64Body);
+  formatted.append("appid", "27");
+  formatted.append("platform", "android");
+  formatted.append("version", "129");
+  formatted.append("medium", "Website");
+
+  const requestUrl = altApi ? apiUrls[1] : apiUrls[0];
+  return fetch(`${conf().CORS_PROXY_URL}${requestUrl}`, {
+    method: "POST",
+    headers: {
+      Platform: "android",
+      "Content-Type": "application/x-www-form-urlencoded",
+    },
+    body: `${formatted.toString()}&token${nanoid()}`,
+  });
+};
+
+registerProvider({
+  id: "superstream",
+  rank: 50,
+  type: [MWMediaType.MOVIE, MWMediaType.SERIES],
+  disabled: true,
+
+  async scrape({
+    media: {
+      meta: { type },
+      tmdbId,
+    },
+  }) {
+    if (type === MWMediaType.MOVIE) {
+      const apiQuery = {
+        uid: "",
+        module: "Movie_downloadurl_v3",
+        mid: tmdbId,
+        oss: "1",
+        group: "",
+      };
+
+      const mediaRes = (await get(apiQuery).then((r) => r.json())).data;
+      const hdQuality =
+        mediaRes.list.find(
+          (quality: any) => quality.quality === "1080p" && quality.path
+        ) ??
+        mediaRes.list.find(
+          (quality: any) => quality.quality === "720p" && quality.path
+        ) ??
+        mediaRes.list.find(
+          (quality: any) => quality.quality === "480p" && quality.path
+        ) ??
+        mediaRes.list.find(
+          (quality: any) => quality.quality === "360p" && quality.path
+        );
+
+      if (!hdQuality) throw new Error("No quality could be found.");
+
+      // const subtitleApiQuery = {
+      //   fid: hdQuality.fid,
+      //   uid: "",
+      //   module: "Movie_srt_list_v2",
+      //   mid: tmdbId,
+      // };
+
+      // const subtitleRes = (await get(subtitleApiQuery).then((r) => r.json()))
+      //   .data;
+      // const mappedCaptions = await Promise.all(
+      //   subtitleRes.list.map(async (subtitle: any) => {
+      //     const captionBlob = await fetch(
+      //       `${conf().CORS_PROXY_URL}${subtitle.subtitles[0].file_path}`
+      //     ).then((captionRes) => captionRes.blob()); // cross-origin bypass
+      //     const captionUrl = await toWebVTT(captionBlob); // convert to vtt so it's playable
+      //     return {
+      //       id: subtitle.language,
+      //       url: captionUrl,
+      //       label: subtitle.language,
+      //     };
+      //   })
+      // );
+
+      return { embeds: [], stream: hdQuality.path };
+    }
+
+    // const apiQuery = {
+    //   uid: "",
+    //   module: "TV_downloadurl_v3",
+    //   episode: media.episodeId,
+    //   tid: media.mediaId,
+    //   season: media.seasonId,
+    //   oss: "1",
+    //   group: "",
+    // };
+    // const mediaRes = (await get(apiQuery).then((r) => r.json())).data;
+    // const hdQuality =
+    //   mediaRes.list.find(
+    //     (quality: any) => quality.quality === "1080p" && quality.path
+    //   ) ??
+    //   mediaRes.list.find(
+    //     (quality: any) => quality.quality === "720p" && quality.path
+    //   ) ??
+    //   mediaRes.list.find(
+    //     (quality: any) => quality.quality === "480p" && quality.path
+    //   ) ??
+    //   mediaRes.list.find(
+    //     (quality: any) => quality.quality === "360p" && quality.path
+    //   );
+
+    // if (!hdQuality) throw new Error("No quality could be found.");
+
+    // const subtitleApiQuery = {
+    //   fid: hdQuality.fid,
+    //   uid: "",
+    //   module: "TV_srt_list_v2",
+    //   episode: media.episodeId,
+    //   tid: media.mediaId,
+    //   season: media.seasonId,
+    // };
+    // const subtitleRes = (await get(subtitleApiQuery).then((r) => r.json()))
+    //   .data;
+    // const mappedCaptions = await Promise.all(
+    //   subtitleRes.list.map(async (subtitle: any) => {
+    //     const captionBlob = await fetch(
+    //       `${conf().CORS_PROXY_URL}${subtitle.subtitles[0].file_path}`
+    //     ).then((captionRes) => captionRes.blob()); // cross-origin bypass
+    //     const captionUrl = await toWebVTT(captionBlob); // convert to vtt so it's playable
+    //     return {
+    //       id: subtitle.language,
+    //       url: captionUrl,
+    //       label: subtitle.language,
+    //     };
+    //   })
+    // );
+
+    return { embeds: [] };
+  },
+});

src/backend/providers/testProviderTwo.ts

@@ -1,37 +0,0 @@
-import { MWEmbedType } from "../helpers/embed";
-import { registerProvider } from "../helpers/register";
-import { MWMediaType } from "../metadata/types";
-
-const timeout = (time: number) =>
-  new Promise<void>((resolve) => {
-    setTimeout(() => resolve(), time);
-  });
-
-registerProvider({
-  id: "testprov2",
-  rank: 40,
-  type: [MWMediaType.MOVIE],
-
-  async scrape({ progress }) {
-    await timeout(1000);
-    progress(25);
-    await timeout(1000);
-    progress(50);
-    await timeout(1000);
-    progress(75);
-    await timeout(1000);
-
-    return {
-      embeds: [
-        {
-          type: MWEmbedType.OPENLOAD,
-          url: "https://google.com",
-        },
-        {
-          type: MWEmbedType.ANOTHER,
-          url: "https://google.com",
-        },
-      ],
-    };
-  },
-});

src/components/media/MediaCard.tsx

@@ -1,6 +1,6 @@
 import { Link } from "react-router-dom";
 import { DotList } from "@/components/text/DotList";
-import { MWMediaMeta, MWMediaType } from "@/backend/metadata/types";
+import { MWMediaMeta } from "@/backend/metadata/types";
 
 export interface MediaCardProps {
   media: MWMediaMeta;
@@ -37,14 +37,15 @@ function MediaCardContent({ media, linkable }: MediaCardProps) {
 }
 
 export function MediaCard(props: MediaCardProps) {
-  let link = "movie";
-  if (props.media.type === MWMediaType.SERIES) link = "series";
-
   const content = <MediaCardContent {...props} />;
 
   if (!props.linkable) return <span>{content}</span>;
   return (
-    <Link to={`/media/${link}/${encodeURIComponent(props.media.id)}`}>
+    <Link
+      to={`/media/${encodeURIComponent(props.media.type)}-${encodeURIComponent(
+        props.media.id
+      )}`}
+    >
       {content}
     </Link>
   );

src/components/video/VideoContext.tsx

@@ -1,3 +1,4 @@
+import { MWStreamType } from "@/backend/helpers/streams";
 import React, {
   createContext,
   MutableRefObject,
@@ -13,17 +14,17 @@ import {
 
 interface VideoPlayerContextType {
   source: string | null;
-  sourceType: "m3u8" | "mp4";
+  sourceType: MWStreamType;
   state: PlayerContext;
 }
 const initial: VideoPlayerContextType = {
   source: null,
-  sourceType: "mp4",
+  sourceType: MWStreamType.MP4,
   state: initialPlayerState,
 };
 
 type VideoPlayerContextAction =
-  | { type: "SET_SOURCE"; url: string; sourceType: "m3u8" | "mp4" }
+  | { type: "SET_SOURCE"; url: string; sourceType: MWStreamType }
   | {
       type: "UPDATE_PLAYER";
       state: PlayerContext;

src/components/video/VideoPlayer.tsx

@@ -39,7 +39,7 @@ export function VideoPlayer(props: VideoPlayerProps) {
   return (
     <VideoPlayerContextProvider player={playerRef} wrapper={playerWrapperRef}>
       <div
-        className="relative aspect-video w-full select-none overflow-hidden bg-black"
+        className="relative h-full w-full select-none overflow-hidden bg-black"
         ref={playerWrapperRef}
       >
         <VideoPlayerInternals

src/components/video/controls/SourceControl.tsx

@@ -1,9 +1,10 @@
+import { MWStreamType } from "@/backend/helpers/streams";
 import { useContext, useEffect } from "react";
 import { VideoPlayerDispatchContext } from "../VideoContext";
 
 interface SourceControlProps {
   source: string;
-  type: "m3u8" | "mp4";
+  type: MWStreamType;
 }
 
 export function SourceControl(props: SourceControlProps) {

src/components/video/hooks/controlVideo.ts

@@ -5,6 +5,7 @@ import {
   canFullscreenAnyElement,
   canWebkitFullscreen,
 } from "@/utils/detectFeatures";
+import { MWStreamType } from "@/backend/helpers/streams";
 import fscreen from "fscreen";
 import React, { RefObject } from "react";
 import { PlayerState } from "./useVideoPlayer";
@@ -19,7 +20,7 @@ export interface PlayerControls {
   setVolume(volume: number): void;
   setSeeking(active: boolean): void;
   setLeftControlsHover(hovering: boolean): void;
-  initPlayer(sourceUrl: string, sourceType: "m3u8" | "mp4"): void;
+  initPlayer(sourceUrl: string, sourceType: MWStreamType): void;
 }
 
 export const initialControls: PlayerControls = {
@@ -104,10 +105,10 @@ export function populateControls(
     setLeftControlsHover(hovering) {
       update((s) => ({ ...s, leftControlHovering: hovering }));
     },
-    initPlayer(sourceUrl: string, sourceType: "m3u8" | "mp4") {
+    initPlayer(sourceUrl: string, sourceType: MWStreamType) {
       this.setVolume(getStoredVolume());
 
-      if (sourceType === "m3u8") {
+      if (sourceType === MWStreamType.HLS) {
         if (player.canPlayType("application/vnd.apple.mpegurl")) {
           player.src = sourceUrl;
         } else {
@@ -125,7 +126,7 @@ export function populateControls(
           hls.attachMedia(player);
           hls.loadSource(sourceUrl);
         }
-      } else if (sourceType === "mp4") {
+      } else if (sourceType === MWStreamType.MP4) {
         player.src = sourceUrl;
       }
     },

src/hooks/useScrape.ts

@@ -1,5 +1,6 @@
 import { findBestStream } from "@/backend/helpers/scrape";
 import { MWStream } from "@/backend/helpers/streams";
+import { DetailedMeta } from "@/backend/metadata/getmeta";
 import { useEffect, useState } from "react";
 
 interface ScrapeEventLog {
@@ -9,7 +10,7 @@ interface ScrapeEventLog {
   id: string;
 }
 
-export function useScrape() {
+export function useScrape(meta: DetailedMeta) {
   const [eventLog, setEventLog] = useState<ScrapeEventLog[]>([]);
   const [stream, setStream] = useState<MWStream | null>(null);
   const [pending, setPending] = useState(true);
@@ -19,10 +20,8 @@ export function useScrape() {
     setStream(null);
     setEventLog([]);
     (async () => {
-      // TODO has test inputs
       const scrapedStream = await findBestStream({
-        imdb: "test1",
+        media: meta,
-        tmdb: "test2",
         onNext(ctx) {
           setEventLog((arr) => [
             ...arr,
@@ -49,7 +48,7 @@ export function useScrape() {
       setPending(false);
       setStream(scrapedStream);
     })();
-  }, []);
+  }, [meta]);
 
   return {
     stream,

src/setup/App.tsx

@@ -5,7 +5,6 @@ import { WatchedContextProvider } from "@/state/watched";
 import { NotFoundPage } from "@/views/notfound/NotFoundView";
 import { MediaView } from "@/views/MediaView";
 import { SearchView } from "@/views/search/SearchView";
-import { TestView } from "@/views/TestView";
 import { MWMediaType } from "@/backend/metadata/types";
 
 function App() {
@@ -16,10 +15,8 @@ function App() {
           <Route exact path="/">
             <Redirect to={`/search/${MWMediaType.MOVIE}`} />
           </Route>
-          <Route exact path="/media/movie/:media" component={MediaView} />
+          <Route exact path="/media/:media" component={MediaView} />
-          <Route exact path="/media/series/:media" component={MediaView} />
           <Route exact path="/search/:type/:query?" component={SearchView} />
-          <Route exact path="/test" component={TestView} />
           <Route path="*" component={NotFoundPage} />
         </Switch>
       </BookmarkContextProvider>

src/state/bookmark/context.tsx

@@ -31,13 +31,7 @@ function getBookmarkIndexFromMedia(
   bookmarks: MWMediaMeta[],
   media: MWMediaMeta
 ): number {
-  const a = bookmarks.findIndex(
+  const a = bookmarks.findIndex((v) => v.id === media.id);
-    (v) =>
-      v.mediaId === media.mediaId &&
-      v.providerId === media.providerId &&
-      v.episodeId === media.episodeId &&
-      v.seasonId === media.seasonId
-  );
   return a;
 }
 
@@ -64,19 +58,19 @@ export function BookmarkContextProvider(props: { children: ReactNode }) {
 
   const contextValue = useMemo(
     () => ({
-      setItemBookmark(media: any, bookmarked: boolean) {
+      setItemBookmark(media: MWMediaMeta, bookmarked: boolean) {
         setBookmarked((data: BookmarkStoreData) => {
           if (bookmarked) {
             const itemIndex = getBookmarkIndexFromMedia(data.bookmarks, media);
             if (itemIndex === -1) {
               const item = {
-                mediaId: media.mediaId,
+                id: media.id,
-                mediaType: media.mediaType,
+                type: media.type,
-                providerId: media.providerId,
+                // providerId: media.providerId,
                 title: media.title,
                 year: media.year,
-                episodeId: media.episodeId,
+                // episodeId: media.episodeId,
-                seasonId: media.seasonId,
+                // seasonId: media.seasonId,
               };
               data.bookmarks.push(item);
             }

src/state/watched/context.tsx

@@ -1,4 +1,4 @@
-import { MWMediaMeta } from "@/backend/metadata/types";
+import { MWMediaMeta, MWMediaType } from "@/backend/metadata/types";
 import React, {
   createContext,
   ReactNode,
@@ -94,42 +94,40 @@ export function WatchedContextProvider(props: { children: ReactNode }) {
         // let filtered = watched.items.filter(
         //   (item) => getProviderMetadata(item.providerId)?.enabled
         // );
+        let filtered = watched.items;
+
         // // get highest episode number for every anime/season
-        // const highestEpisode: Record<string, [number, number]> = {};
+        const highestEpisode: Record<string, [number, number]> = {};
-        // const highestWatchedItem: Record<string, WatchedStoreItem> = {};
+        const highestWatchedItem: Record<string, WatchedStoreItem> = {};
-        // filtered = filtered.filter((item) => {
+        filtered = filtered.filter((item) => {
-        //   if (
+          if ([MWMediaType.ANIME, MWMediaType.SERIES].includes(item.type)) {
-        //     [MWMediaType.ANIME, MWMediaType.SERIES].includes(item.mediaType)
+            const key = `${item.type}-${item.id}`;
-        //   ) {
+            const current: [number, number] = [
-        //     const key = `${item.mediaType}-${item.mediaId}`;
+              item.episodeId ? parseInt(item.episodeId, 10) : -1,
-        //     const current: [number, number] = [
+              item.seasonId ? parseInt(item.seasonId, 10) : -1,
-        //       item.episodeId ? parseInt(item.episodeId, 10) : -1,
+            ];
-        //       item.seasonId ? parseInt(item.seasonId, 10) : -1,
+            let existing = highestEpisode[key];
-        //     ];
+            if (!existing) {
-        //     let existing = highestEpisode[key];
+              existing = current;
-        //     if (!existing) {
+              highestEpisode[key] = current;
-        //       existing = current;
+              highestWatchedItem[key] = item;
-        //       highestEpisode[key] = current;
+            }
-        //       highestWatchedItem[key] = item;
+            if (
-        //     }
+              current[0] > existing[0] ||
-        //     if (
+              (current[0] === existing[0] && current[1] > existing[1])
-        //       current[0] > existing[0] ||
+            ) {
-        //       (current[0] === existing[0] && current[1] > existing[1])
+              highestEpisode[key] = current;
-        //     ) {
+              highestWatchedItem[key] = item;
-        //       highestEpisode[key] = current;
+            }
-        //       highestWatchedItem[key] = item;
+            return false;
-        //     }
+          }
-        //     return false;
+          return true;
-        //   }
+        });
-        //   return true;
+        return [...filtered, ...Object.values(highestWatchedItem)];
-        // });
-        // return [...filtered, ...Object.values(highestWatchedItem)];
       },
       watched,
     }),
-    [
+    [watched]
-      /*watched, setWatched*/
-    ]
   );
 
   return (

src/views/MediaView.tsx

@@ -1,22 +1,88 @@
-import { useHistory } from "react-router-dom";
+import { useHistory, useParams } from "react-router-dom";
-import { useCallback } from "react";
+import { useCallback, useEffect, useState } from "react";
 import { DecoratedVideoPlayer } from "@/components/video/DecoratedVideoPlayer";
+import { MWStream } from "@/backend/helpers/streams";
+import { useScrape } from "@/hooks/useScrape";
+import { VideoPlayerHeader } from "@/components/video/parts/VideoPlayerHeader";
+import { DetailedMeta, getMetaFromId } from "@/backend/metadata/getmeta";
+import { JWMediaToMediaType } from "@/backend/metadata/justwatch";
+import { SourceControl } from "@/components/video/controls/SourceControl";
+
+function MediaViewLoading() {
+  return <p>Loading meta...</p>;
+}
+
+interface MediaViewScrapingProps {
+  onStream(stream: MWStream): void;
+  onGoBack(): void;
+  meta: DetailedMeta;
+}
+function MediaViewScraping(props: MediaViewScrapingProps) {
+  const { eventLog, pending, stream } = useScrape(props.meta);
+
+  useEffect(() => {
+    if (stream) {
+      props.onStream(stream);
+    }
+  }, [stream, props]);
+
+  return (
+    <div>
+      <VideoPlayerHeader
+        onClick={props.onGoBack}
+        title={props.meta.meta.title}
+      />
+      <p>pending: {pending.toString()}</p>
+      <p>
+        stream: {stream?.streamUrl} - {stream?.type} - {stream?.quality}
+      </p>
+      <hr />
+      {eventLog.map((v) => (
+        <div className="rounded-xl p-1 text-white">
+          <p>
+            {v.percentage}% - {v.type} - {v.errored ? "ERROR" : "pending"}
+          </p>
+        </div>
+      ))}
+    </div>
+  );
+}
 
 export function MediaView() {
   const reactHistory = useHistory();
+  const params = useParams<{ media: string }>();
   const goBack = useCallback(() => {
     if (reactHistory.action !== "POP") reactHistory.goBack();
     else reactHistory.push("/");
   }, [reactHistory]);
 
-  // TODO fetch meta
+  const [meta, setMeta] = useState<DetailedMeta | null>(null);
-  // TODO call useScrape
+  const [stream, setStream] = useState<MWStream | null>(null);
+
+  useEffect(() => {
+    (async () => {
+      const [t, id] = params.media.split("-", 2);
+      const type = JWMediaToMediaType(t);
+      const fetchedMeta = await getMetaFromId(type, id);
+      setMeta(fetchedMeta);
+    })();
+  }, [setMeta, params]);
+
   // TODO not found checks
   // TODO watched store
   // TODO scrape loading state
   // TODO error page with video header
 
+  if (!meta) return <MediaViewLoading />;
+  if (!stream)
+    return (
+      <MediaViewScraping meta={meta} onGoBack={goBack} onStream={setStream} />
+    );
   return (
-    <DecoratedVideoPlayer title="Hello world" onGoBack={goBack} autoPlay />
+    <div className="h-screen w-screen">
+      <DecoratedVideoPlayer title={meta.meta.title} onGoBack={goBack} autoPlay>
+        <SourceControl source={stream.streamUrl} type={stream.type} />
+      </DecoratedVideoPlayer>
+    </div>
   );
 }

src/views/TestView.tsx

@@ -1,82 +0,0 @@
-// import { searchForMedia } from "@/backend/metadata/search";
-// import { ProgressListenerControl } from "@/components/video/controls/ProgressListenerControl";
-// import { SourceControl } from "@/components/video/controls/SourceControl";
-// import { DecoratedVideoPlayer } from "@/components/video/DecoratedVideoPlayer";
-import { useScrape } from "@/hooks/useScrape";
-// import { MWMediaType } from "@/providers";
-// import { useCallback, useState } from "react";
-
-// test videos: https://gist.github.com/jsturgis/3b19447b304616f18657
-
-// TODO video todos:
-//  - error handling
-//  - captions
-//  - mobile UI
-//  - safari fullscreen will make video overlap player controls
-//  - safari progress bar is fucked (video doesnt change time but video.currentTime does change)
-
-// TODO optional todos:
-//  - shortcuts when player is active
-//  - improve seekables (if possible)
-
-// TODO stuff to test:
-//  - browser: firefox, chrome, edge, safari desktop
-//  - phones: android firefox, android chrome, iphone safari
-//  - devices: ipadOS
-//  - features: HLS, error handling, preload interactions
-
-// export function TestView() {
-//   const [show, setShow] = useState(true);
-//   const handleClick = useCallback(() => {
-//     setShow((v) => !v);
-//   }, [setShow]);
-
-//   if (!show) {
-//     return <p onClick={handleClick}>Click me to show</p>;
-//   }
-
-//   async function search() {
-//     const test = await searchForMedia({
-//       searchQuery: "tron",
-//       type: MWMediaType.MOVIE,
-//     });
-//     console.log(test);
-//   }
-
-//   return (
-//     <div className="w-[40rem] max-w-full">
-//       <DecoratedVideoPlayer>
-//         <SourceControl
-//           source="http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/Sintel.mp4"
-//           type="mp4"
-//         />
-//         <ProgressListenerControl
-//           startAt={283}
-//           onProgress={(a, b) => console.log(a, b)}
-//         />
-//       </DecoratedVideoPlayer>
-//       <p onClick={() => search()}>click me to search</p>
-//     </div>
-//   );
-// }
-
-export function TestView() {
-  const { eventLog, pending, stream } = useScrape();
-
-  return (
-    <div>
-      <p>pending: {pending}</p>
-      <p>
-        stream: {stream?.streamUrl} - {stream?.type} - {stream?.quality}
-      </p>
-      <hr />
-      {eventLog.map((v) => (
-        <div className="rounded-xl p-1 text-white">
-          <p>
-            {v.percentage}% - {v.type} - {v.errored ? "ERROR" : "pending"}
-          </p>
-        </div>
-      ))}
-    </div>
-  );
-}

src/views/search/HomeView.tsx

@@ -32,41 +32,41 @@ function Bookmarks() {
   );
 }
 
-function Watched() {
+// function Watched() {
-  const { t } = useTranslation();
+//   const { t } = useTranslation();
-  const { getFilteredBookmarks } = useBookmarkContext();
+//   const { getFilteredBookmarks } = useBookmarkContext();
-  const { getFilteredWatched } = useWatchedContext();
+//   const { getFilteredWatched } = useWatchedContext();
 
-  const bookmarks = getFilteredBookmarks();
+//   const bookmarks = getFilteredBookmarks();
-  const watchedItems = getFilteredWatched().filter(
+//   const watchedItems = getFilteredWatched().filter(
-    (v) => !getIfBookmarkedFromPortable(bookmarks, v)
+//     (v) => !getIfBookmarkedFromPortable(bookmarks, v)
-  );
+//   );
 
-  if (watchedItems.length === 0) return null;
+//   if (watchedItems.length === 0) return null;
 
-  return (
+//   return (
-    <SectionHeading
+//     <SectionHeading
-      title={t("search.continueWatching") || "Continue Watching"}
+//       title={t("search.continueWatching") || "Continue Watching"}
-      icon={Icons.CLOCK}
+//       icon={Icons.CLOCK}
-    >
+//     >
-      <MediaGrid>
+//       <MediaGrid>
-        {/* {watchedItems.map((v) => (
+//         {/* {watchedItems.map((v) => (
-          <WatchedMediaCard
+//           <WatchedMediaCard
-            key={[v.mediaId, v.providerId].join("|")}
+//             key={[v.mediaId, v.providerId].join("|")}
-            media={v}
+//             media={v}
-            series
+//             series
-          />
+//           />
-        ))} */}
+//         ))} */}
-      </MediaGrid>
+//       </MediaGrid>
-    </SectionHeading>
+//     </SectionHeading>
-  );
+//   );
-}
+// }
 
 export function HomeView() {
   return (
     <div className="mb-16 mt-32">
-      <Bookmarks />
+      {/* <Bookmarks /> */}
-      <Watched />
+      {/* <Watched /> */}
     </div>
   );
 }

src/views/search/SearchResultsView.tsx

@@ -65,8 +65,6 @@ export function SearchResultsView({ searchQuery }: { searchQuery: MWQuery }) {
   if (error) return <SearchSuffix failed />;
   if (!results) return null;
 
-  // TODO on click go to the right page with id instead of portable
-
   return (
     <div>
       {results.length > 0 ? (