Merge pull request #77 from JamesHawkinss/dev

V2.0.2

.dockerignore

@@ -0,0 +1,6 @@
+.git
+node_modules
+build
+.env.local
+.github
+.vscode

.eslintrc.js

@@ -1,5 +1,5 @@
 const a11yOff = Object.keys(require('eslint-plugin-jsx-a11y').rules)
-    .reduce((acc, rule) => { acc[`jsx-a11y/${rule}`] = 'off'; return acc }, {})
+  .reduce((acc, rule) => { acc[`jsx-a11y/${rule}`] = 'off'; return acc }, {})
 
 module.exports = {
   extends: [
@@ -37,6 +37,10 @@ module.exports = {
     "@typescript-eslint/no-shadow": ["error"],
     "no-restricted-syntax": "off",
     "react/jsx-props-no-spreading": "off",
+    "consistent-return": "off",
+    "no-continue": "off",
+    "no-eval": "off",
+    "no-await-in-loop": "off",
     "react/jsx-filename-extension": [
       "error",
       { extensions: [".js", ".tsx", ".jsx"] },

dockerfile

@@ -0,0 +1,13 @@
+FROM node:16.15-alpine as build
+WORKDIR /app
+ENV PATH /app/node_modules/.bin:$PATH
+COPY package*.json ./
+RUN yarn install
+COPY . ./
+RUN yarn build
+
+# production environment
+FROM nginx:stable-alpine
+COPY --from=build /app/build /usr/share/nginx/html
+EXPOSE 80
+CMD ["nginx", "-g", "daemon off;"]

package.json

@@ -1,28 +1,19 @@
 {
   "name": "movie-web",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "private": true,
   "homepage": "https://movie.squeezebox.dev",
   "dependencies": {
     "@headlessui/react": "^1.5.0",
-    "@testing-library/jest-dom": "^5.11.4",
-    "@testing-library/react": "^11.1.0",
-    "@testing-library/user-event": "^12.1.10",
-    "@types/crypto-js": "^4.1.1",
-    "@types/react-router": "^5.1.18",
     "crypto-js": "^4.1.1",
     "fuse.js": "^6.4.6",
     "hls.js": "^1.0.7",
     "json5": "^2.2.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "react-helmet": "^6.1.0",
     "react-router-dom": "^5.2.0",
-    "react-scripts": "^5.0.0",
-    "react-tracked": "^1.7.6",
-    "scheduler": "^0.20.2",
-    "unpacker": "^1.0.1",
-    "web-vitals": "^1.0.1"
+    "react-scripts": "5.0.1",
+    "unpacker": "^1.0.1"
   },
   "scripts": {
     "start": "react-scripts start",
@@ -43,11 +34,12 @@
     ]
   },
   "devDependencies": {
-    "@types/jest": "^27.4.0",
+    "@types/crypto-js": "^4.1.1",
     "@types/node": "^17.0.15",
     "@types/react": "^17.0.39",
     "@types/react-dom": "^17.0.11",
     "@types/react-router-dom": "^5.3.3",
+    "@types/react-router": "^5.1.18",
     "@typescript-eslint/eslint-plugin": "^5.13.0",
     "@typescript-eslint/parser": "^5.13.0",
     "autoprefixer": "^10.4.2",
@@ -57,7 +49,7 @@
     "eslint-import-resolver-typescript": "^2.5.0",
     "eslint-plugin-import": "^2.25.4",
     "eslint-plugin-jsx-a11y": "^6.5.1",
-    "eslint-plugin-react": "7.28.0",
+    "eslint-plugin-react": "7.29.4",
     "eslint-plugin-react-hooks": "4.3.0",
     "postcss": "^8.4.6",
     "prettier": "^2.5.1",

src/App.tsx

@@ -8,7 +8,6 @@ import { MediaView } from "./views/MediaView";
 import { SearchView } from "./views/SearchView";
 
 function App() {
-
   return (
     <WatchedContextProvider>
       <BookmarkContextProvider>

src/components/SearchBar.tsx

@@ -7,31 +7,39 @@ import { TextInputControl } from "./text-inputs/TextInputControl";
 export interface SearchBarProps {
   buttonText?: string;
   placeholder?: string;
-  onChange: (value: MWQuery) => void;
+  onChange: (value: MWQuery, force: boolean) => void;
+  onUnFocus: () => void;
   value: MWQuery;
 }
 
 export function SearchBarInput(props: SearchBarProps) {
   const [dropdownOpen, setDropdownOpen] = useState(false);
   function setSearch(value: string) {
-    props.onChange({
-      ...props.value,
-      searchQuery: value,
-    });
+    props.onChange(
+      {
+        ...props.value,
+        searchQuery: value,
+      },
+      false
+    );
   }
   function setType(type: string) {
-    props.onChange({
-      ...props.value,
-      type: type as MWMediaType,
-    });
+    props.onChange(
+      {
+        ...props.value,
+        type: type as MWMediaType,
+      },
+      true
+    );
   }
 
   return (
-    <div className="bg-denim-300 hover:bg-denim-400 focus-within:bg-denim-400 flex flex-col items-center gap-4 rounded-[28px] px-4 py-4 transition-colors sm:flex-row sm:py-2 sm:pl-8  sm:pr-2">
+    <div className="flex flex-col items-center gap-4 rounded-[28px] bg-denim-300 px-4 py-4 transition-colors focus-within:bg-denim-400 hover:bg-denim-400 sm:flex-row sm:py-2 sm:pl-8  sm:pr-2">
       <TextInputControl
+        onUnFocus={props.onUnFocus}
         onChange={(val) => setSearch(val)}
         value={props.value.searchQuery}
-        className="placeholder-denim-700 w-full flex-1 bg-transparent text-white focus:outline-none"
+        className="w-full flex-1 bg-transparent text-white placeholder-denim-700 focus:outline-none"
         placeholder={props.placeholder}
       />
 

src/components/layout/ErrorBoundary.tsx

@@ -48,7 +48,7 @@ export class ErrorBoundary extends Component<
   }
 
   render() {
-    if (!this.state.hasError) return this.props.children;
+    if (!this.state.hasError) return this.props.children as any;
 
     return (
       <div className="flex min-h-screen w-full flex-col items-center justify-center px-4 py-12">
@@ -69,7 +69,7 @@ export class ErrorBoundary extends Component<
           </p>
         </div>
         {this.state.error ? (
-          <div className="bg-denim-300 w-4xl mt-12 max-w-full rounded px-6 py-4">
+          <div className="w-4xl mt-12 max-w-full rounded bg-denim-300 px-6 py-4">
             <p className="mb-1 break-words font-bold text-white">
               {this.state.error.name} - {this.state.error.description}
             </p>

src/components/text-inputs/TextInputControl.tsx

@@ -1,5 +1,6 @@
 export interface TextInputControlPropsNoLabel {
   onChange?: (data: string) => void;
+  onUnFocus?: () => void;
   value?: string;
   placeholder?: string;
   className?: string;
@@ -11,6 +12,7 @@ export interface TextInputControlProps extends TextInputControlPropsNoLabel {
 
 export function TextInputControl({
   onChange,
+  onUnFocus,
   value,
   label,
   className,
@@ -23,6 +25,7 @@ export function TextInputControl({
       placeholder={placeholder}
       onChange={(e) => onChange && onChange(e.target.value)}
       value={value}
+      onBlur={() => onUnFocus && onUnFocus()}
     />
   );
 

src/hooks/usePortableMedia.ts

@@ -1,6 +1,6 @@
 import { MWPortableMedia } from "providers";
 import { useEffect, useState } from "react";
-import { useParams } from "react-router";
+import { useParams } from "react-router-dom";
 
 export function deserializePortableMedia(media: string): MWPortableMedia {
   return JSON.parse(atob(decodeURIComponent(media)));

src/hooks/useSearchQuery.ts

@@ -1,19 +1,25 @@
 import { MWMediaType, MWQuery } from "providers";
-import React, { useState } from "react";
+import React, { useRef, useState } from "react";
 import { generatePath, useHistory, useRouteMatch } from "react-router-dom";
 
-export function useSearchQuery(): [MWQuery, (inp: Partial<MWQuery>) => void] {
+export function useSearchQuery(): [
+  MWQuery,
+  (inp: Partial<MWQuery>, force: boolean) => void,
+  () => void
+] {
   const history = useHistory();
+  const isFirstRender = useRef(true);
   const { path, params } = useRouteMatch<{ type: string; query: string }>();
   const [search, setSearch] = useState<MWQuery>({
     searchQuery: "",
     type: MWMediaType.MOVIE,
   });
 
-  const updateParams = (inp: Partial<MWQuery>) => {
+  const updateParams = (inp: Partial<MWQuery>, force: boolean) => {
     const copySearch: MWQuery = { ...search };
     Object.assign(copySearch, inp);
     setSearch(copySearch);
+    if (!force) return;
     history.replace(
       generatePath(path, {
         query:
@@ -23,13 +29,27 @@ export function useSearchQuery(): [MWQuery, (inp: Partial<MWQuery>) => void] {
     );
   };
 
+  const onUnFocus = () => {
+    history.replace(
+      generatePath(path, {
+        query: search.searchQuery.length === 0 ? undefined : search.searchQuery,
+        type: search.type,
+      })
+    );
+  };
+
+  // only run on first load of the page
   React.useEffect(() => {
+    if (isFirstRender.current === false) {
+      return;
+    }
+    isFirstRender.current = false;
     const type =
       Object.values(MWMediaType).find((v) => params.type === v) ||
       MWMediaType.MOVIE;
     const searchQuery = params.query || "";
     setSearch({ type, searchQuery });
-  }, [params, setSearch]);
+  }, [setSearch, params, isFirstRender]);
 
-  return [search, updateParams];
+  return [search, updateParams, onUnFocus];
 }

src/mw_constants.ts

@@ -2,4 +2,4 @@ export const CORS_PROXY_URL = "https://proxy-1.movie-web.workers.dev/?destinatio
 export const OMDB_API_KEY = "aa0937c0";
 export const DISCORD_LINK = "https://discord.gg/Jhqt4Xzpfb";
 export const GITHUB_LINK = "https://github.com/JamesHawkinss/movie-web";
-export const APP_VERSION = "2.0.1";
+export const APP_VERSION = "2.0.2";

src/providers/list/gomostream/index.ts

@@ -9,6 +9,7 @@ import {
 
 import { CORS_PROXY_URL, OMDB_API_KEY } from "mw_constants";
 import { unpack } from "unpacker";
+import json5 from "json5";
 
 export const gomostreamScraper: MWMediaProvider = {
   id: "gomostream",
@@ -74,18 +75,24 @@ export const gomostreamScraper: MWMediaProvider = {
         'x-token': `${tc.slice(5, 13).split("").reverse().join("")}13574199`
       }
     }).then((d) => d.json());
+    const embeds = src.filter((url: string) => url.includes('gomo.to'));
 
-    const embedUrl = src.find((url: string) => url.includes('gomo.to'));
+    // maybe try all embeds in the future
+    const embedUrl = embeds[1];
     const res2 = await fetch(`${CORS_PROXY_URL}${embedUrl}`).then((d) => d.text());
 
     const res2DOM = new DOMParser().parseFromString(res2, "text/html");
     if (res2DOM.body.innerText === "File was deleted") throw new Error("File was deleted");
 
-    const script = res2DOM.querySelectorAll("script")[8].innerHTML;
-    const unpacked = unpack(script).split('');
-    unpacked.splice(0, 43);
-    const index = unpacked.findIndex((e) => e === '"');
-    const streamUrl = unpacked.slice(0, index).join('');
+    const script = Array.from(res2DOM.querySelectorAll("script")).find((s: HTMLScriptElement) => s.innerHTML.includes("eval(function(p,a,c,k,e,d"))?.innerHTML;
+    if (!script) throw new Error("Could not get packed data")
+
+    const unpacked = unpack(script);
+    const rawSources = /sources:(\[.*?\])/.exec(unpacked);
+    if (!rawSources) throw new Error("Could not get rawSources");
+
+    const sources = json5.parse(rawSources[1]);
+    const streamUrl = sources[0].file;
 
     const streamType = streamUrl.split('.').at(-1);
     if (streamType !== "mp4" && streamType !== "m3u8") throw new Error("Unsupported stream type");

src/providers/list/xemovie/index.ts

@@ -0,0 +1,103 @@
+import {
+  MWMediaProvider,
+  MWMediaType,
+  MWPortableMedia,
+  MWMediaStream,
+  MWQuery,
+  MWProviderMediaResult,
+  MWMediaCaption
+} from "providers/types";
+
+import { CORS_PROXY_URL } from "mw_constants";
+
+export const xemovieScraper: MWMediaProvider = {
+  id: "xemovie",
+  enabled: true,
+  type: [MWMediaType.MOVIE],
+  displayName: "xemovie",
+
+  async getMediaFromPortable(media: MWPortableMedia): Promise<MWProviderMediaResult> {
+    const res = await fetch(
+      `${CORS_PROXY_URL}https://xemovie.co/movies/${media.mediaId}/watch`,
+    ).then(d => d.text());
+
+    const DOM = new DOMParser().parseFromString(res, "text/html");
+
+    const title = DOM.querySelector(".text-primary.text-lg.font-extrabold")?.textContent || "";
+    const year = DOM.querySelector("div.justify-between:nth-child(3) > div:nth-child(2)")?.textContent || "";
+
+    return {
+      ...media,
+      title,
+      year,
+    } as MWProviderMediaResult;
+  },
+
+  async searchForMedia(query: MWQuery): Promise<MWProviderMediaResult[]> {
+    const term = query.searchQuery.toLowerCase();
+
+    const searchUrl = `${CORS_PROXY_URL}https://xemovie.co/search?q=${encodeURIComponent(term)}`;
+    const searchRes = await fetch(searchUrl).then((d) => d.text());
+
+    const parser = new DOMParser();
+    const doc = parser.parseFromString(searchRes, "text/html");
+
+    const movieContainer = doc.querySelectorAll(".py-10")[0].querySelector(".grid");
+    if (!movieContainer) return [];
+    const movieNodes = Array.from(movieContainer.querySelectorAll("a")).filter(link => !link.className);
+
+    const results: MWProviderMediaResult[] = movieNodes.map((node) => {
+      const parent = node.parentElement;
+      if (!parent) return;
+
+      const aElement = parent.querySelector("a");
+      if (!aElement) return;
+
+      return {
+        title: parent.querySelector("div > div > a > h6")?.textContent,
+        year: parent.querySelector("div.float-right")?.textContent,
+        mediaId: aElement.href.split('/').pop() || "",
+      }
+    }).filter((d): d is MWProviderMediaResult => !!d);
+
+    return results;
+  },
+
+  async getStream(media: MWPortableMedia): Promise<MWMediaStream> {
+    if (media.mediaType !== MWMediaType.MOVIE) throw new Error("Incorrect type")
+
+    const url = `${CORS_PROXY_URL}https://xemovie.co/movies/${media.mediaId}/watch`;
+
+    let streamUrl = "";
+    const subtitles: MWMediaCaption[] = [];
+
+    const res = await fetch(url).then(d => d.text());
+    const scripts = Array.from(new DOMParser().parseFromString(res, "text/html").querySelectorAll("script"));
+
+    for (const script of scripts) {
+      if (!script.textContent) continue;
+
+      if (script.textContent.match(/https:\/\/[a-z][0-9]\.xemovie\.com/)) {
+        const data = JSON.parse(JSON.stringify(eval(`(${script.textContent.replace("const data = ", "").split("};")[0]}})`)));
+        streamUrl = data.playlist[0].file;
+
+        for (const [index, subtitleTrack] of data.playlist[0].tracks.entries()) {
+          const subtitleBlob = URL.createObjectURL(
+            await fetch(`${CORS_PROXY_URL}${subtitleTrack.file}`).then((captionRes) => captionRes.blob())
+          ); // do this so no need for CORS errors
+
+          subtitles.push({
+            id: index,
+            url: subtitleBlob,
+            label: subtitleTrack.label
+          })
+        }
+      }
+    }
+
+    const streamType = streamUrl.split('.').at(-1);
+    if (streamType !== "mp4" && streamType !== "m3u8") throw new Error("Unsupported stream type");
+
+    return { url: streamUrl, type: streamType, captions: subtitles } as MWMediaStream;
+  }
+};

src/providers/methods/providers.ts

@@ -2,11 +2,13 @@ import { theFlixScraper } from "providers/list/theflix";
 import { gDrivePlayerScraper } from "providers/list/gdriveplayer";
 import { MWWrappedMediaProvider, WrapProvider } from "providers/wrapper";
 import { gomostreamScraper } from "providers/list/gomostream";
+import { xemovieScraper } from "providers/list/xemovie";
 
 export const mediaProvidersUnchecked: MWWrappedMediaProvider[] = [
   WrapProvider(theFlixScraper),
   WrapProvider(gDrivePlayerScraper),
   WrapProvider(gomostreamScraper),
+  WrapProvider(xemovieScraper),
 ];
 
 export const mediaProviders: MWWrappedMediaProvider[] =

src/providers/methods/search.ts

@@ -73,7 +73,11 @@ function sortResults(
   providerResults: MWMassProviderOutput
 ): MWMassProviderOutput {
   const results: MWMassProviderOutput = { ...providerResults };
-  const fuse = new Fuse(results.results, { threshold: 0.3, keys: ["title"] });
+  const fuse = new Fuse(results.results, {
+    threshold: 0.3,
+    keys: ["title"],
+    fieldNormWeight: 0.5,
+  });
   results.results = fuse.search(query.searchQuery).map((v) => v.item);
   return results;
 }

src/views/SearchView.tsx

@@ -165,7 +165,7 @@ function ExtraItems() {
 export function SearchView() {
   const [searching, setSearching] = useState<boolean>(false);
   const [loading, setLoading] = useState<boolean>(false);
-  const [search, setSearch] = useSearchQuery();
+  const [search, setSearch, setSearchUnFocus] = useSearchQuery();
 
   const debouncedSearch = useDebounce<MWQuery>(search, 2000);
   useEffect(() => {
@@ -182,7 +182,7 @@ export function SearchView() {
       return (
         <SearchResultsView
           searchQuery={debouncedSearch}
-          clear={() => setSearch({ searchQuery: "" })}
+          clear={() => setSearch({ searchQuery: "" }, true)}
         />
       );
     return <ExtraItems />;
@@ -201,6 +201,7 @@ export function SearchView() {
           <SearchBarInput
             onChange={setSearch}
             value={search}
+            onUnFocus={setSearchUnFocus}
             placeholder="What movie do you want to watch?"
           />
         </div>