Update dependencies and version

Added Voe.sx Domain

.eslintignore

@@ -1,9 +0,0 @@
-.DS_Store
-node_modules
-/dist
-/release
-.env
-.env.*
-!.env.example
-
-package-lock.json

.eslintrc.cjs

@@ -1,33 +0,0 @@
-module.exports = {
-	root: true,
-	extends: [
-		'eslint:recommended',
-		'plugin:@typescript-eslint/recommended',
-		'plugin:svelte/recommended',
-		'prettier'
-	],
-	parser: '@typescript-eslint/parser',
-	plugins: ['@typescript-eslint'],
-	parserOptions: {
-		sourceType: 'module',
-		ecmaVersion: 2020,
-		extraFileExtensions: ['.svelte']
-	},
-	env: {
-		browser: true,
-		es2017: true,
-		node: true
-	},
-	overrides: [
-		{
-			files: ['*.svelte'],
-			parser: 'svelte-eslint-parser',
-			parserOptions: {
-				parser: '@typescript-eslint/parser'
-			}
-		}
-	],
-	rules: {
-		'@typescript-eslint/no-explicit-any': 'off'
-	}
-};

.github/workflows/ci.yml

@@ -9,12 +9,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install nodejs
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 22
           cache: 'npm'
 
       - name: Install dependencies
@@ -32,12 +32,12 @@ jobs:
           - manifest_version: 3
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install nodejs
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 22
           cache: 'npm'
 
       - name: Install dependencies
@@ -49,7 +49,7 @@ jobs:
         run: npm run build
 
       - name: Upload
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: stream-bypass-mv${{ matrix.manifest_version }}
           path: ./dist

.prettierrc

@@ -1,8 +0,0 @@
-{
-	"useTabs": true,
-	"singleQuote": true,
-	"trailingComma": "none",
-	"printWidth": 100,
-	"plugins": ["prettier-plugin-svelte"],
-	"overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }]
-}

.prettierrc.cjs

@@ -0,0 +1,17 @@
+// @ts-check
+
+/** @type {import("prettier").Config} */
+module.exports = {
+	useTabs: true,
+	singleQuote: true,
+	trailingComma: 'none',
+	printWidth: 100,
+	plugins: ['prettier-plugin-svelte', '@ianvs/prettier-plugin-sort-imports'],
+	/* prettier-plugin-svelte */
+	overrides: [{ files: '*.svelte', options: { parser: 'svelte' } }],
+	/* @ianvs/prettier-plugin-sort-imports */
+	importOrder: ['^~/(.*)$', '^./(.*)$', ''],
+	importOrderParserPlugins: ['typescript'],
+	importOrderTypeScriptVersion: '5.0.0',
+	importOrderCaseSensitive: false
+};

README.md

@@ -3,21 +3,18 @@
 A multi-browser addon / extension for multiple streaming providers which redirects directly to the source video.
 
 <p align="center">
-  <a href="https://github.com/ByteDream/stream-bypass/releases/latest">
+  <a href="https://github.com/bytedream/stream-bypass/releases/latest">
     <img src="https://img.shields.io/github/v/release/ByteDream/stream-bypass?label=Version&style=flat-square" alt="Version">
   </a>
   <a href="https://addons.mozilla.org/de/firefox/addon/stream-bypass/">
-    <img src="https://img.shields.io/amo/users/stream-bypass?label=Firefox%20Store%20Downloads&style=flat-square" alt="Firefox Addon Store">
+    <img src="https://img.shields.io/amo/users/stream-bypass?label=Firefox%20Users&style=flat-square" alt="Firefox Addon Store">
   </a>
-  <a href="https://addons.mozilla.org/de/firefox/addon/stream-bypass/">
-    <img src="https://img.shields.io/amo/stars/stream-bypass?label=Firefox%20Store%20Stars&style=flat-square" alt="Firefox Addon Stars">
+  <a href="https://chromewebstore.google.com/detail/ddfpfjomnakfckhmilacnbokdaknamdb">
+    <img src="https://img.shields.io/chrome-web-store/users/ddfpfjomnakfckhmilacnbokdaknamdb?style=flat-square&label=Chrome%20Users" alt="Chrome Store">
   </a>
-  <a href="https://github.com/ByteDream/stream-bypass/releases/latest">
+  <a href="https://github.com/bytedream/stream-bypass/releases/latest">
     <img src="https://img.shields.io/github/downloads/ByteDream/stream-bypass/total?label=GitHub%20Downloads&style=flat-square" alt="GitHub Downloads">
   </a>
-  <a href="https://discord.gg/gUWwekeNNg">
-    <img src="https://img.shields.io/discord/915659846836162561?label=Discord&style=flat-square" alt="Discord">
-  </a>
 </p>
 
 <p align="center">
@@ -25,7 +22,9 @@ A multi-browser addon / extension for multiple streaming providers which redirec
   •
   <a href="#-installation">Installation 📥</a>
   •
-  <a href="#-supported-sites">Supported Sites 📜</a>
+  <a href="#-features">Features ✨</a>
+  •
+  <a href="#-supported-websites">Supported Websites 📜</a>
   •
   <a href="#%EF%B8%8F-building">Building 🛠️</a>
   •
@@ -51,7 +50,8 @@ Additionally, this enables you to download the video by right-clicking it and ju
 
 The best way to install the extension are the official browser extension stores:
 
-- [Firefox Addon Store](https://addons.mozilla.org/de/firefox/addon/stream-bypass/)
+- [Firefox Addon Store](https://addons.mozilla.org/de/firefox/addon/stream-bypass/) (Firefox for Android is supported too!)
+- [Chrome Web Store](https://chromewebstore.google.com/detail/ddfpfjomnakfckhmilacnbokdaknamdb)
 
 ### Manual installation
 
@@ -61,49 +61,54 @@ The best way to install the extension are the official browser extension stores:
   - Click the `Load Temporary Add-on...` button and choose the `manifest.json` file in the unzipped directory
 - Chromium / Google Chrome
   > As nearly every browser other than Firefox is based on Chromium, this should be the same for most of them
-  - Download `enhance-crunchyroll-<version>-mv3.zip` from the [latest release](https://github.com/ByteDream/stream-bypass/releases/latest) and unzip it (with [7zip](https://www.7-zip.org/) or something like that)
+  - Download `stream-bypass-<version>-mv3.zip` from the [latest release](https://github.com/ByteDream/stream-bypass/releases/latest) and unzip it (with [7zip](https://www.7-zip.org/) or something like that)
   - Go into your browser and type `chrome://extensions` in the address bar
   - Turn on the developer mode by checking the switch in the top right corner
   - Click `Load unpacked` and choose the unzipped directory
 
-## 📜 Supported sites
+## ✨ Features
 
-| Site                                                                  | Supported | Note                                                                                                         |
-| --------------------------------------------------------------------- | --------- | ------------------------------------------------------------------------------------------------------------ |
-| [doodstream.com](doodstream.com) / [dood.pm](https://dood.pm)         | ✔️        |                                                                                                              |
-| [filemoon.sx](https://filemoon.sx)                                    | ✔        |                                                                                                              |
-| [mcloud.to](https://mcloud.to/)                                       | ❌        | Reverse engineering the site costs too much time ([#5](https://github.com/ByteDream/stream-bypass/issues/5)) |
-| [mixdrop.co](https://mixdrop.co)                                      | ✔ ️      |                                                                                                              |
-| [mp4upload.com](https://mp4upload.com)                                | ✔        |                                                                                                              |
-| [newgrounds.com](https://newgrounds.com)                              | ✔        |                                                                                                              |
-| [streamtape.com](https://streamtape.com)                              | ✔        |                                                                                                              |
-| [streamzz.to](https://streamzz.to) / [streamz.ws](https://streamz.ws) | ✔        |                                                                                                              |
-| [upstream.to](https://upstream.to)                                    | ✔        |                                                                                                              |
-| [videovard.sx](https://videovard.sx)                                  | ❌        | Reverse engineering the site costs too much time                                                             |
-| [vidoza.net](https://vidoza.net)                                      | ✔        |                                                                                                              |
-| [vidstream.pro](https://vidstream.pro)                                | ❌        | Reverse engineering the site costs too much time ([#5](https://github.com/ByteDream/stream-bypass/issues/5)) |
-| [voe.sx](https://voe.sx)                                              | ✔        |                                                                                                              |
-| [vupload.com](https://vupload.com)                                    | ✔        |                                                                                                              |
-| [kwik.cx](https://kwik.cx)                                            | ✔        |                                                                                                              |
-| [dropload.io](https://dropload.io)                                    | ✔        |                                                                                                              |
-| [supervideo.tv](https://supervideo.tv)                                | ✔        |                                                                                                              |
-| [goodstream.uno](https://goodstream.uno)                              | ✔        |                                                                                                              |
+| Feature                                                                                                                           | Firefox | Chrome | Firefox for Android |
+| --------------------------------------------------------------------------------------------------------------------------------- | ------- | ------ | ------------------- |
+| Replace site-speicifc video player with browser native video player                                                               | ✔      | ✔     | ✔                  |
+| Support websites that are accessed via a redirect                                                                                 | ✔      | ❌     | ✔                  |
+| Open video in mpv (with [ff2mpv](https://github.com/ByteDream/stream-bypass/tree/master#ff2mpv-use-mpv-to-directly-play-streams)) | ✔      | ✔     | ❌                  |
+
+- ✔️: Supported.
+- ❌: Not supported.
+
+## 📜 Supported websites
+
+| Site                                                                  | Firefox & Firefox for Android                                                            | Chrome & Chromium based                                                                  |
+| --------------------------------------------------------------------- | ---------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------- |
+| [dropload.io](https://dropload.io)                                    | ✔                                                                                       | ✔                                                                                       |
+| [doodstream.com](doodstream.com) / [dood.pm](https://dood.pm)         | ✔                                                                                       | ⚠ (redirect probably required)                                                          |
+| [filemoon.to](https://filemoon.to)                                    | ✔                                                                                       | ✔                                                                                       |
+| [goodstream.uno](https://goodstream.uno)                              | ✔                                                                                       | ✔                                                                                       |
+| [kwik.cx](https://kwik.cx)                                            | ✔                                                                                       | ✔                                                                                       |
+| [loadx.ws](https://loadx.ws)                                          | ✔                                                                                       | ❌ (background request always required)                                                  |
+| [luluvdo.com](https://luluvdo.com)                                    | ✔                                                                                       | ❌ (background request always required)                                                  |
+| [mixdrop.co](https://mixdrop.co)                                      | ✔ ️                                                                                     | ✔                                                                                       |
+| [mp4upload.com](https://mp4upload.com)                                | ✔                                                                                       | ✔                                                                                       |
+| [newgrounds.com](https://newgrounds.com)                              | ✔                                                                                       | ✔                                                                                       |
+| [streama2z.com](https://streama2z.com)                                | ✔                                                                                       | ❌ (redirect always required)                                                            |
+| [streamtape.com](https://streamtape.com)                              | ⚠ (correct video url can't always be extract, retrying/reloading the page might fix it) | ⚠ (correct video url can't always be extract, retrying/reloading the page might fix it) |
+| [streamzz.to](https://streamzz.to) / [streamz.ws](https://streamz.ws) | ✔                                                                                       | ✔                                                                                       |
+| [supervideo.tv](https://supervideo.tv)                                | ✔                                                                                       | ✔                                                                                       |
+| [upstream.to](https://upstream.to)                                    | ✔                                                                                       | ✔                                                                                       |
+| [vidmoly.to](https://vidmoly.me)                                      | ✔                                                                                       | ✔                                                                                       |
+| [vidoza.net](https://vidoza.net)                                      | ✔                                                                                       | ✔                                                                                       |
+| [voe.sx](https://voe.sx)                                              | ✔                                                                                       | ❌ (redirect always required)                                                            |
+| [vupload.com](https://vupload.com)                                    | ✔                                                                                       | ✔                                                                                       |
 
 - ✔️: Everything ok.
-- ⚠: Included in the addon but will probably not work. See `Note` in this case, an explanation why will stand there in the most cases.
-- ❌: Not included / supported by the addon. This can have various reasons. See `Note` for an explanation.
+- ⚠: Works with limitations.
+- ❌: Not supported.
+
+_This table might not be 100% accurate, it isn't actively monitored if the addon works for every website!_
 
 Some sites put much effort in obfuscating their code / how they receive the video stream so that it simply cost too much time for me to reverse engineer it and find out how to bypass the native video player of the site.
 
-<details>
-    <summary>Hall of dead sites</summary>
-    <ul>
-        <li><a href="https://evoload.io">evoload.io</a> - Down</li>
-        <li><a href="https://vidlox.me">vidlox.me</a> - Reachable but empty</li>
-        <li><a href="https://vivo.sx">vivo.sx</a> - Down</li>
-    </ul>
-</details>
-
 ## 🛠️ Building
 
 If you want to build the addon from source and not using the [installation](#installation) way, follow the instructions.
@@ -119,16 +124,16 @@ If the requirements are satisfied, you can continue with the following commands:
 # install all dependencies
 $ npm install
 
-# build the extension source to a build/ directory
+# build the extension source to the dist/ directory
 $ npm run build
 
-# same as build + create a bundle zipfile at dist/
-$ npm run bundle
+# same as build + more optimizations and browser specific settings at release/
+$ npm run release:firefox  # or "release:chrome" to create a release for chromium based browsers
 ```
 
 ##### Install
 
-If you want to use the addon in Chromium or any browser which is based on it (almost every other, Google Chrome, Opera, ...), follow the steps in [installation](#-installation).
+If you want to use the addon in Chromium or any browser which is based on it, follow the steps in [installation](#-installation).
 When using firefox, use the following:
 
 1. Type `about:debugging` in the browser's address bar.
@@ -158,11 +163,11 @@ Steps to get it set up:
   - Chrome/Chromium:
     - Go To: Settings -> Extensions
     - Click on `Details` of the Stream Bypass extension and copy the ID
-    - Add `chrome-extension://your-id-here/` to `allowed_origins` ->
+    - Add `chrome-extension://ddfpfjomnakfckhmilacnbokdaknamdb/` to `allowed_origins` ->
       ```
       "allowed_origins": [
         "chrome-extension://ephjcajbkgplkjmelpglennepbpmdpjg/",
-        "chrome-extension://your-id-her/"
+        "chrome-extension://ddfpfjomnakfckhmilacnbokdaknamdb/"
       ]
       ```
 

eslint.config.mjs

@@ -0,0 +1,40 @@
+import js from '@eslint/js';
+import prettier from 'eslint-config-prettier';
+import svelte from 'eslint-plugin-svelte';
+import ts from 'typescript-eslint';
+
+export default ts.config(
+	js.configs.recommended,
+	...ts.configs.recommended,
+	...svelte.configs['flat/recommended'],
+	prettier,
+	...svelte.configs['flat/prettier'],
+	{
+		files: ['**/*.svelte'],
+
+		languageOptions: {
+			parserOptions: {
+				parser: ts.parser
+			}
+		}
+	},
+	{
+		rules: {
+			'@typescript-eslint/no-explicit-any': 'off',
+			'no-undef': 'off'
+		}
+	},
+	{
+		ignores: [
+			'.DS_Store',
+			'node_modules',
+			'dist',
+			'release',
+			'.idea',
+			'.env',
+			'.env.*',
+			'!.env.example',
+			'package-lock.json'
+		]
+	}
+);

package.json

@@ -1,8 +1,8 @@
 {
 	"name": "stream-bypass",
-	"version": "3.0.0",
+	"version": "3.1.6",
 	"displayName": "Stream Bypass",
-	"author": "ByteDream",
+	"author": "bytedream",
 	"description": "Multi-browser addon for multiple streaming providers which redirects directly to the source video",
 	"scripts": {
 		"build": "vite build",
@@ -11,42 +11,41 @@
 		"serve:firefox": "web-ext run --start-url \"about:debugging#/runtime/this-firefox\" --source-dir ./dist/",
 		"serve:chrome": "web-ext run -t chromium --start-url \"https://example.com\" --source-dir ./dist/",
 		"check": "svelte-check --tsconfig ./tsconfig.json",
-		"lint": "prettier --check --plugin prettier-plugin-svelte . && eslint .",
-		"format": "prettier --write --plugin prettier-plugin-svelte .",
+		"lint": "prettier --check . && eslint .",
+		"format": "prettier --write .",
 		"release:firefox": "MANIFEST_VERSION=2 vite build --outDir release/firefox",
 		"release:chrome": "MANIFEST_VERSION=3 vite build --outDir release/chrome"
 	},
 	"license": "MIT",
 	"repository": {
 		"type": "git",
-		"url": "git+https://github.com/ByteDream/stream-bypass.git"
+		"url": "git+https://github.com/bytedream/stream-bypass.git"
 	},
 	"bugs": {
-		"url": "https://github.com/ByteDream/stream-bypass/issues"
+		"url": "https://github.com/bytedream/stream-bypass/issues"
 	},
 	"devDependencies": {
-		"@samrum/vite-plugin-web-extension": "^5.0.0",
-		"@sveltejs/vite-plugin-svelte": "^2.1.1",
-		"@tsconfig/svelte": "^4.0.1",
-		"@types/chrome": "^0.0.228",
-		"@types/webextension-polyfill": "^0.10.0",
-		"@typescript-eslint/eslint-plugin": "^6.10.0",
-		"@typescript-eslint/parser": "^6.10.0",
-		"eslint": "^8.53.0",
-		"eslint-config-prettier": "^9.0.0",
-		"eslint-plugin-svelte": "^2.35.0",
-		"hls.js": "^1.4.12",
-		"prettier": "^3.0.3",
-		"prettier-plugin-svelte": "^3.1.0",
-		"sass": "^1.69.5",
-		"svelte": "^3.58.0",
-		"svelte-check": "^3.2.0",
-		"svelte-preprocess": "^5.0.3",
-		"tslib": "^2.5.0",
-		"typescript": "^5.0.4",
-		"vite": "~4.3.3",
-		"web-ext": "^7.6.2",
-		"webextension-polyfill": "^0.10.0"
+		"@ianvs/prettier-plugin-sort-imports": "^4.4.1",
+		"@samrum/vite-plugin-web-extension": "^5.1.1",
+		"@sveltejs/vite-plugin-svelte": "^5.0.3",
+		"@tsconfig/svelte": "^5.0.4",
+		"@types/chrome": "^0.0.320",
+		"@types/firefox-webext-browser": "^120.0.4",
+		"eslint": "^9.26.0",
+		"eslint-config-prettier": "^10.1.3",
+		"eslint-plugin-svelte": "^3.5.1",
+		"hls.js": "^1.6.2",
+		"prettier": "^3.5.3",
+		"prettier-plugin-svelte": "^3.3.3",
+		"sass": "^1.87.0",
+		"svelte": "^5.28.2",
+		"svelte-check": "^4.1.7",
+		"svelte-preprocess": "^6.0.3",
+		"tslib": "^2.8.1",
+		"typescript": "^5.8.3",
+		"typescript-eslint": "^8.32.0",
+		"vite": "^6.3.5",
+		"web-ext": "^8.6.0"
 	},
 	"type": "module"
 }

src/entries/background/main.ts

@@ -1,24 +0,0 @@
-import type { Match } from '~/lib/match';
-import { storageDelete, storageGet, storageSet } from '~/lib/settings';
-import { getMatch } from '~/lib/match';
-
-chrome.runtime.onMessage.addListener(async (message) => {
-	if (message.action == 'ff2mpv') {
-		await chrome.runtime.sendNativeMessage('ff2mpv', { url: message.url });
-	}
-});
-
-chrome.webRequest.onBeforeRedirect.addListener(
-	async (details) => {
-		// check if redirects origins from a previous redirect
-		if ((await storageGet('redirect')) === undefined) {
-			let match: Match;
-			if ((match = await getMatch(new URL(details.url).hostname)) !== undefined) {
-				await storageSet('redirect', match.id);
-			}
-		} else {
-			await storageDelete('redirect');
-		}
-	},
-	{ urls: ['<all_urls>'], types: ['main_frame', 'sub_frame'] }
-);

src/entries/background/mv2.ts

@@ -0,0 +1,39 @@
+import './shared';
+
+import { getMatch, type Match } from '~/lib/match';
+import { Redirect, UrlReferer } from '~/lib/settings';
+
+chrome.webRequest.onBeforeSendHeaders.addListener(
+	// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+	// @ts-ignore
+	async (details) => {
+		const referer = await UrlReferer.get(new URL(details.url).hostname);
+		if (!referer) return;
+
+		await UrlReferer.delete(new URL(details.url).hostname);
+
+		details.requestHeaders!.push({
+			name: 'Referer',
+			value: `https://${referer}/`
+		});
+
+		return { requestHeaders: details.requestHeaders };
+	},
+	{ urls: ['<all_urls>'], types: ['xmlhttprequest'] },
+	['blocking', 'requestHeaders']
+);
+
+chrome.webRequest.onBeforeRedirect.addListener(
+	async (details) => {
+		// check if redirects origins from a previous redirect
+		if ((await Redirect.get()) == null) {
+			let match: Match | null;
+			if ((match = await getMatch(new URL(details.url).hostname)) !== null) {
+				await Redirect.set(match);
+			}
+		} else {
+			await Redirect.delete();
+		}
+	},
+	{ urls: ['<all_urls>'], types: ['main_frame', 'sub_frame'] }
+);

src/entries/background/mv3.ts

@@ -0,0 +1 @@
+import './shared';

src/entries/background/shared.ts

@@ -0,0 +1,5 @@
+chrome.runtime.onMessage.addListener(async (message) => {
+	if (message.action == 'ff2mpv') {
+		await chrome.runtime.sendNativeMessage('ff2mpv', { url: message.url });
+	}
+});

src/entries/contentScript/main.ts

@@ -1,10 +1,8 @@
-import type { Match } from '~/lib/match';
-import { getMatch } from '~/lib/match';
+import { getMatch, MatchMediaType, type Match } from '~/lib/match';
 import { Other, Redirect } from '~/lib/settings';
-import browser from 'webextension-polyfill';
 
 async function main() {
-	let match: Match;
+	let match: Match | null;
 	let redirect = false;
 	if ((match = await getMatch(window.location.host)) === null) {
 		if ((match = await Redirect.get()) === null) {
@@ -13,36 +11,91 @@ async function main() {
 		redirect = true;
 	}
 
-	const re = document.body.innerHTML.match(match.regex);
+	// some sites have a javascript based redirect, e.g. example.com redirects to example.org by changing
+	// window.location.href instead of a 3XX http redirect. an empty body is a sign that such a javascript redirect
+	// occurred
+	if (document.body == null) {
+		await Redirect.set(match);
+		return;
+	}
+
+	let re = null;
+	for (const regex of match.regex) {
+		if ((re = document.body.innerHTML.match(regex)) !== null) {
+			break;
+		}
+	}
 	if (re === null) {
 		return;
 	}
+
 	if (redirect) {
 		await Redirect.delete();
 	}
 
-	const url = await match.match(re);
+	let url: string | null;
+	let urlType: MatchMediaType | null;
+	try {
+		const matchResult = await match.match(re);
+		if (matchResult && typeof matchResult === 'string') {
+			url = matchResult;
+			urlType = url.includes('.m3u8') ? MatchMediaType.Hls : MatchMediaType.Native;
+		} else if (matchResult && typeof matchResult === 'object') {
+			if (MatchMediaType.Hls in matchResult) {
+				url = matchResult[MatchMediaType.Hls];
+				urlType = MatchMediaType.Hls;
+			} else if (MatchMediaType.Native in matchResult) {
+				url = matchResult[MatchMediaType.Native];
+				urlType = MatchMediaType.Native;
+			}
+		}
+	} catch {
+		return;
+	}
+
+	// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+	// @ts-ignore
+	if (!url || !urlType) {
+		return;
+	}
 
 	// send the url to the ff2mpv (https://github.com/woodruffw/ff2mpv) application
 	if (await Other.getFf2mpv()) {
-		await browser.runtime.sendMessage({ action: 'ff2mpv', url: url });
+		await chrome.runtime.sendMessage({ action: 'ff2mpv', url: url });
 	}
 
-	if (match.replace && !url.includes('.m3u8')) {
+	if (match.replace && urlType != MatchMediaType.Hls) {
+		// this destroys all intervals that may spawn popups or events
+		let intervalId = window.setInterval(() => {}, 0);
+		while (intervalId--) {
+			clearInterval(intervalId);
+		}
+		let timeoutId = window.setTimeout(() => {}, 0);
+		while (timeoutId--) {
+			clearTimeout(timeoutId);
+		}
+
+		// clear completed document
+		document.documentElement.innerHTML = '';
+
+		document.body.style.backgroundColor = '#131313';
+
+		// video player
 		const player = document.createElement('video');
 		player.style.width = '100%';
 		player.style.height = '100%';
 		player.controls = true;
 		player.src = url;
 
-		document.body.innerHTML = '';
+		// add video player to document body
+		document.body.style.margin = '0';
 		document.body.append(player);
 	} else {
 		window.location.assign(
-			browser.runtime.getURL(
+			chrome.runtime.getURL(
 				`src/entries/player/player.html?id=${match.id}&url=${encodeURIComponent(url)}&domain=${
 					window.location.hostname
-				}`
+				}&type=${urlType}`
 			)
 		);
 	}

src/entries/player/Player.svelte

@@ -1,8 +1,9 @@
 <script lang="ts">
-	import { play } from '~/entries/player/player';
 	import { onMount } from 'svelte';
+	import { play } from '~/entries/player/player';
+
+	let errorMessage: string | null = $state(null);
 
-	let errorMessage: string | null = null;
 	let videoElem: HTMLVideoElement;
 
 	onMount(async () => {
@@ -10,13 +11,13 @@
 			await play(videoElem);
 			videoElem.controls = true;
 		} catch (e) {
-			errorMessage = e;
+			errorMessage = e as string;
 		}
 	});
 </script>
 
-<!-- svelte-ignore a11y-media-has-caption -->
-<video id="video" bind:this={videoElem} />
+<!-- svelte-ignore a11y_media_has_caption -->
+<video id="video" bind:this={videoElem}></video>
 {#if errorMessage}
 	<div id="message-container">
 		<p>

src/entries/player/player.html

@@ -6,9 +6,10 @@
 	</head>
 	<body>
 		<script type="module">
+			import { mount } from 'svelte';
 			import Player from '~/entries/player/Player.svelte';
 
-			new Player({
+			mount(Player, {
 				target: document.body
 			});
 		</script>

src/entries/player/player.ts

@@ -1,16 +1,23 @@
-import { matches } from '~/lib/match';
 import Hls from 'hls.js';
+import { matches, MatchMediaType } from '~/lib/match';
+import { UrlReferer } from '~/lib/settings';
+
+async function playNative(url: string, domain: string, videoElem: HTMLVideoElement) {
+	await UrlReferer.set(new URL(url).hostname, domain);
 
-async function playNative(url: string, videoElem: HTMLVideoElement) {
 	videoElem.src = url;
 }
 
-async function playHls(url: string, videoElem: HTMLVideoElement) {
+async function playHls(url: string, domain: string, videoElem: HTMLVideoElement) {
 	if (videoElem.canPlayType('application/vnd.apple.mpegurl')) {
 		videoElem.src = url;
 	} else if (Hls.isSupported()) {
 		const hls = new Hls({
-			enableWorker: false
+			enableWorker: false,
+			xhrSetup: async (xhr: XMLHttpRequest, url: string) => {
+				await UrlReferer.set(new URL(url).hostname, domain);
+				xhr.open('GET', url);
+			}
 		});
 		hls.loadSource(url);
 		hls.attachMedia(videoElem);
@@ -21,9 +28,10 @@ async function playHls(url: string, videoElem: HTMLVideoElement) {
 
 export async function play(videoElem: HTMLVideoElement) {
 	const urlQuery = new URLSearchParams(window.location.search);
-	const id = urlQuery.get('id');
-	const url = decodeURIComponent(urlQuery.get('url'));
-	const domain = urlQuery.get('domain');
+	const id = urlQuery.get('id') as string;
+	const url = decodeURIComponent(urlQuery.get('url') as string);
+	const domain = urlQuery.get('domain') as string;
+	const type = urlQuery.get('type') as MatchMediaType;
 
 	const match = matches[id];
 	if (match === undefined) {
@@ -31,9 +39,9 @@ export async function play(videoElem: HTMLVideoElement) {
 	}
 	document.title = `Stream Bypass (${domain})`;
 
-	if (new URL(url).pathname.endsWith('.m3u8')) {
-		await playHls(url, videoElem);
-	} else {
-		await playNative(url, videoElem);
+	if (type === MatchMediaType.Hls) {
+		await playHls(url, domain, videoElem);
+	} else if (type === MatchMediaType.Native) {
+		await playNative(url, domain, videoElem);
 	}
 }

src/entries/popup/Popup.svelte

@@ -1,123 +1,97 @@
 <script lang="ts">
-	import { matches, Reliability } from '~/lib/match';
+	import { matches, type Match } from '~/lib/match';
 	import { Hosters, Other } from '~/lib/settings';
+	import Toggle from './toggle.svelte';
 
 	let hostersEnabled: boolean;
-	let hosters = [];
+	let hosters: (Match & { active: boolean; disabled: boolean })[] = [];
 	(async () => {
 		hostersEnabled = !(await Hosters.getAllDisabled());
 
 		const disabled = await Hosters.getDisabled();
-		hosters = Object.values(matches).map((m) => {
+		hosters = Object.values(matches).map((m: any) => {
 			m['active'] = disabled.findIndex((p) => p.id == m.id) == -1;
-			m['disabled'] = !hostersEnabled;
 			return m;
-		});
+		}) as typeof hosters;
+	})();
+
+	let isMobile: boolean;
+	(async () => {
+		isMobile = (await browser.runtime.getPlatformInfo()).os === 'android';
 	})();
 
 	let ff2mpvEnabled: boolean;
 	(async () => {
-		ff2mpvEnabled = await Other.getFf2mpv();
+		ff2mpvEnabled = (await Other.getFf2mpv()) as boolean;
 	})();
 </script>
 
-<main>
-	<div>
-		<h3 class="header">Hosters</h3>
-		<div class="buttons super-buttons">
-			<button
-				class:active={hostersEnabled}
-				on:click={async () => {
-					await Hosters.enableAll();
-					hostersEnabled = true;
-					hosters = hosters.map((m) => {
-						m['disabled'] = false;
-						return m;
-					});
-				}}>On</button
-			>
-			<button
-				class:active={!hostersEnabled}
-				on:click={async () => {
-					await Hosters.disableAll();
-					hostersEnabled = false;
-					hosters = hosters.map((m) => {
-						m['disabled'] = true;
-						return m;
-					});
-				}}>Off</button
-			>
-		</div>
-		<table class="setting-table">
-			{#each hosters as hoster}
-				<tr>
-					<td class="setting-name">
-						<p
-							class:reliability-low={hoster.reliability === Reliability.LOW}
-							class:reliability-normal={hoster.reliability === Reliability.NORMAL}
-							class:reliability-high={hoster.reliability === Reliability.HIGH}
-						>
-							{hoster.name}
-						</p>
-					</td>
-					<td class="buttons">
-						<button
-							class:disabled={hoster.disabled}
-							class:active={hoster.active}
-							on:click={async () => {
-								if (hoster.disabled) return;
+<main
+	style={isMobile
+		? 'height: 100vh; display: flex; flex-direction: column; align-items: center'
+		: 'height: 500px'}
+>
+	<fieldset>
+		<legend>Hoster</legend>
+		<div class="setting-container" style={isMobile ? 'grid-column-gap: 5rem' : ''}>
+			<label for="hosters-enabled">Enabled</label>
+			<div>
+				<Toggle
+					bind:checked={hostersEnabled}
+					id="hosters-enabled"
+					onChange={() => Hosters.setAll(hostersEnabled)}
+				/>
+			</div>
+			<hr />
+			{#each hosters as hoster, i (hoster.id)}
+				<label for="hoster-{i}" style="cursor: {hostersEnabled ? 'pointer' : 'default'}"
+					>{hoster.name}</label
+				>
+				<div>
+					<Toggle
+						bind:checked={hoster.active}
+						disabled={!hostersEnabled}
+						id="hoster-{i}"
+						onChange={async () => {
+							if (hoster.active) {
 								await Hosters.enable(hoster);
-								hoster.active = true;
-							}}>On</button
-						>
-						<button
-							class:disabled={hoster.disabled}
-							class:active={!hoster.active}
-							on:click={async () => {
-								if (hoster.disabled) return;
+							} else {
 								await Hosters.disable(hoster);
-								hoster.active = false;
-							}}>Off</button
-						>
-					</td>
-				</tr>
+							}
+						}}
+					></Toggle>
+				</div>
 			{/each}
-		</table>
-	</div>
-	<hr />
-	<div>
-		<h3 class="header">Other</h3>
-		<table>
-			<tr>
-				<td class="setting-name">
-					<p>ff2mpv</p>
-				</td>
-				<td class="buttons">
-					<button
-						class:active={ff2mpvEnabled}
-						on:click={async () => {
-							await Other.setFf2mpv(true);
-							ff2mpvEnabled = true;
-						}}>On</button
-					>
-					<button
-						class:active={!ff2mpvEnabled}
-						on:click={async () => {
-							await Other.setFf2mpv(false);
-							ff2mpvEnabled = false;
-						}}>Off</button
-					>
+		</div>
+	</fieldset>
+	{#if !isMobile}
+		<fieldset>
+			<legend>Other</legend>
+			<div class="setting-container">
+				<label for="ff2mpv">ff2mpv</label>
+				<div>
+					<Toggle
+						bind:checked={ff2mpvEnabled}
+						id="ff2mpv"
+						onChange={async () => {
+							ff2mpvEnabled = !ff2mpvEnabled;
+							if (await browser.permissions.request({ permissions: ['nativeMessaging'] })) {
+								await Other.setFf2mpv(ff2mpvEnabled);
+								ff2mpvEnabled = !ff2mpvEnabled;
+							}
+						}}
+					></Toggle>
 					<a
+						class="info-questionmark"
 						href="https://github.com/ByteDream/stream-bypass/tree/master#ff2mpv-use-mpv-to-directly-play-streams"
-						>🛈</a
+						>?</a
 					>
-				</td>
-			</tr>
-		</table>
-	</div>
-	<hr />
-	<a id="bug-notice" href="https://github.com/ByteDream/stream-bypass/issues"
-		>Something does not work</a
+				</div>
+			</div>
+		</fieldset>
+	{/if}
+	<a id="report-notice" href="https://github.com/ByteDream/stream-bypass/issues"
+		>Report issues or requests</a
 	>
 </main>
 
@@ -127,11 +101,16 @@
 		background-color: #2b2a33;
 		color: white;
 		font-weight: bold;
-		overflow-x: hidden;
-		overflow-y: auto;
+		margin: 0;
+		padding: 0 8px;
 	}
 
-	#bug-notice {
+	fieldset {
+		border-radius: 5px;
+		border-color: gray;
+	}
+
+	#report-notice {
 		border: none;
 		color: white;
 		display: block;
@@ -154,65 +133,33 @@
 		text-align: center;
 	}
 
-	.setting-table {
-		border-collapse: collapse;
-		border-spacing: 0;
-	}
+	.setting-container {
+		display: grid;
+		grid-template-columns: auto auto;
+		grid-column-gap: 5px;
+		grid-row-gap: 4px;
+		align-items: end;
+		width: 100%;
 
-	.setting-name {
-		height: 34px;
-
-		p {
+		& > label {
+			height: 34px;
 			margin: 0;
-			cursor: default;
-		}
-	}
-
-	.buttons {
-		display: flex;
-		flex-direction: row;
-		height: 34px;
-
-		button,
-		a {
-			border: 1px solid #281515;
-			background-color: transparent;
-			color: white;
+			user-select: none;
 			cursor: pointer;
-			padding: 5px 8px;
-			margin: 0;
-			text-decoration: none;
-
-			&.active {
-				background-color: rgba(255, 65, 65, 0.74);
-				cursor: default;
-			}
-
-			&.disabled {
-				background-color: gray;
-				cursor: not-allowed;
-			}
-		}
-
-		&.super-buttons {
 			display: flex;
-			justify-content: center;
-			gap: 4px;
+			align-items: center;
+		}
+
+		& > hr {
+			grid-column: 1 / span 2;
 			width: 100%;
-			margin-bottom: 10px;
 		}
 	}
 
-	.reliability-low {
-		text-decoration: underline;
-		text-decoration-color: red;
-	}
-	.reliability-normal {
-		text-decoration: underline;
-		text-decoration-color: yellow;
-	}
-	.reliability-high {
-		text-decoration: underline;
-		text-decoration-color: #00ff00;
+	.info-questionmark {
+		display: inline-block;
+		transform: translateX(-40%) translateY(-100%);
+		color: black;
+		text-decoration: none;
 	}
 </style>

src/entries/popup/index.html

@@ -1,14 +1,16 @@
 <!doctype html>
-<html lang="en">
+<html style="overflow-y: hidden" lang="en">
 	<head>
 		<meta charset="UTF-8" />
+		<meta name="viewport" content="width=device-width" />
 		<title>Stream Bypass</title>
 	</head>
-	<body style="width: fit-content; height: 500px">
+	<body style="overflow-y: scroll">
 		<script type="module">
+			import { mount } from 'svelte';
 			import Popup from '~/entries/popup/Popup.svelte';
 
-			new Popup({
+			mount(Popup, {
 				target: document.body
 			});
 		</script>

src/entries/popup/main.ts

@@ -1,5 +0,0 @@
-import App from './Popup.svelte';
-
-new App({
-	target: document.getElementById('app')
-});

src/entries/popup/toggle.svelte

@@ -0,0 +1,68 @@
+<!-- https://flowbite.com/docs/forms/toggle/ -->
+<script lang="ts">
+	import type { Snippet } from 'svelte';
+
+	type Props = {
+		checked?: boolean;
+		disabled?: boolean;
+		id?: string | null;
+		onChange?: () => void;
+		children?: Snippet;
+	};
+	let { checked = $bindable(), disabled, id = null, onChange, children }: Props = $props();
+</script>
+
+<label class="toggle">
+	{@render children?.()}
+	<input type="checkbox" {id} bind:checked {disabled} onchange={onChange} />
+	<span></span>
+</label>
+
+<style lang="scss" global>
+	.toggle {
+		display: inline-flex;
+		align-items: center;
+		cursor: pointer;
+
+		input {
+			clip: rect(0, 0, 0, 0);
+			position: absolute;
+
+			&:checked + span {
+				background: limegreen;
+
+				&:after {
+					transform: translateX(100%);
+				}
+			}
+
+			&:disabled + span {
+				background: gray;
+			}
+		}
+
+		span {
+			position: relative;
+			width: 2.75rem;
+			height: 1.5rem;
+			background: #cf0000;
+			border-radius: 9999px;
+
+			&:after {
+				content: '';
+				position: absolute;
+				top: 2px;
+				inset-inline-start: 2px;
+				background: white;
+				border-radius: 9999px;
+				height: 1.25rem;
+				width: 1.25rem;
+				transition: all 0.15s;
+			}
+		}
+
+		&:has(input:disabled) {
+			cursor: default;
+		}
+	}
+</style>

src/lib/match.ts

@@ -1,28 +1,33 @@
-import { unpack } from '~/lib/utils';
-import { Hosters } from '~/lib/settings';
-
-export enum Reliability {
-	HIGH,
-	NORMAL,
-	LOW
-}
+import { Hosters, Redirect, TmpHost } from './settings';
+import { lastPathSegment } from './util/extract';
+import { unpack } from './util/userspace';
 
 export interface Match {
 	name: string;
 	id: string;
-	reliability: Reliability;
 	domains: string[];
 	replace?: boolean;
-	regex: RegExp;
+	regex: RegExp[];
 	notice?: string;
 
-	match(match: RegExpMatchArray): Promise<string>;
+	match(
+		match: RegExpMatchArray
+	): Promise<
+		string | { [MatchMediaType.Hls]: string } | { [MatchMediaType.Native]: string } | null
+	>;
+
+	// allow other properties that may be implemented by the objects that use this interface declaration
+	[other: string]: any;
+}
+
+export enum MatchMediaType {
+	Hls = 'hls',
+	Native = 'native'
 }
 
 export const Doodstream: Match = {
 	name: 'Doodstream',
 	id: 'doodstream',
-	reliability: Reliability.NORMAL,
 	domains: [
 		'doodstream.com',
 		'dood.pm',
@@ -31,18 +36,22 @@ export const Doodstream: Match = {
 		'dood.cx',
 		'dood.sh',
 		'dood.watch',
+		'dood.work',
 		'dood.to',
 		'dood.so',
 		'dood.la',
+		'dood.li',
 		'dood.re',
 		'dood.yt',
+		'doods.pro',
 		'ds2play.com',
-		'dooood.com'
+		'dooood.com',
+		'd000d.com'
 	],
 	replace: true,
-	regex: /(\/pass_md5\/.*?)'.*(\?token=.*?expiry=)/s,
+	regex: [/(\/pass_md5\/.*?)'.*(\?token=.*?expiry=)/s],
 
-	match: async (match: RegExpMatchArray) => {
+	match: async function (match: RegExpMatchArray) {
 		const response = await fetch(`https://${window.location.host}${match[1]}`, {
 			headers: {
 				Range: 'bytes=0-'
@@ -58,37 +67,42 @@ export const Doodstream: Match = {
 export const DropLoad: Match = {
 	name: 'Dropload',
 	id: 'dropload',
-	reliability: Reliability.HIGH,
-	domains: ['dropload.ui'],
-	regex: /eval\(function\(p,a,c,k,e,d\).*?(?=<\/script>)/gms,
+	domains: ['dropload.io'],
+	regex: [/eval\(function\(p,a,c,k,e,d\).*?(?=<\/script>)/gms],
 
-	match: async (match: RegExpMatchArray) => {
+	match: async function (match: RegExpMatchArray) {
 		const unpacked = await unpack(match[0]);
-		return unpacked.match(/(?<=file:").*(?=")/)[0];
+		return unpacked.match(/(?<=file:").*(?=")/)![0];
 	}
 };
 
 export const Filemoon: Match = {
 	name: 'Filemoon',
 	id: 'filemoon',
-	reliability: Reliability.HIGH,
-	domains: ['filemoon.sx', 'filemoon.in'],
-	regex: /eval\(function\(p,a,c,k,e,d\).*?(?=<\/script>)/gms,
+	domains: ['filemoon.sx', 'filemoon.to', 'filemoon.in'],
+	regex: [/(?<=<iframe\s*src=")\S*(?=")/s, /eval\(function\(p,a,c,k,e,d\).*?(?=<\/script>)/gms],
+	replace: true,
+
+	match: async function (match: RegExpMatchArray) {
+		if (window.location.host.startsWith('filemoon')) {
+			await TmpHost.set(new URL(match[0]).host, Filemoon);
+			return null;
+		}
+
+		await TmpHost.delete();
 
-	match: async (match: RegExpMatchArray) => {
 		const unpacked = await unpack(match[0]);
-		return unpacked.match(/(?<=file:").*(?=")/)[0];
+		return unpacked.match(/(?<=file:")\S*(?=")/)![0];
 	}
 };
 
 export const GoodStream: Match = {
 	name: 'Goodstream',
 	id: 'goodstream',
-	reliability: Reliability.NORMAL,
 	domains: ['goodstream.uno'],
-	regex: /(?<=file:\s+").*(?=")/g,
+	regex: [/(?<=file:\s+").*(?=")/g],
 
-	match: async (match: RegExpMatchArray) => {
+	match: async function (match: RegExpMatchArray) {
 		return match[0];
 	}
 };
@@ -96,26 +110,83 @@ export const GoodStream: Match = {
 export const Kwik: Match = {
 	name: 'Kwik',
 	id: 'kwik',
-	reliability: Reliability.HIGH,
 	domains: ['kwik.cx'],
-	regex: /eval\(function\(p,a,c,k,e,d\).*?(?=<\/script>)/gms,
+	regex: [/eval\(function\(p,a,c,k,e,d\).*?(?=<\/script>)/gms],
 
-	match: async (match: RegExpMatchArray) => {
+	match: async function (match: RegExpMatchArray) {
 		const unpacked = await unpack(match[0]);
-		return unpacked.match(/(?<=source=').*(?=')/)[0];
+		return unpacked.match(/(?<=source=').*(?=')/)![0];
+	}
+};
+
+export const LoadX: Match = {
+	name: 'LoadX',
+	id: 'loadx',
+	domains: ['loadx.ws'],
+	regex: [/./gm],
+
+	match: async () => {
+		const hash = encodeURIComponent(lastPathSegment(window.location.href));
+		const response = await fetch(
+			`https://${window.location.host}/player/index.php?data=${hash}&do=getVideo`,
+			{
+				method: 'POST',
+				headers: {
+					'X-Requested-With': 'XMLHttpRequest'
+				}
+			}
+		);
+
+		const responseJson = await response.json();
+		const videoSource: string = responseJson['videoSource'];
+
+		// extension of extracted url is '.txt', so we have to manually specify that it's a hls
+		return { [MatchMediaType.Hls]: videoSource.replace('\\/', '/') };
+	}
+};
+
+export const Luluvdo: Match = {
+	name: 'Luluvdo',
+	id: 'luluvdo',
+	domains: ['luluvdo.com'],
+	regex: [/./gm],
+
+	match: async () => {
+		const requestBody = new FormData();
+		requestBody.set('op', 'embed');
+		requestBody.set('file_code', lastPathSegment(window.location.href));
+		const response = await fetch(`https://${window.location.host}/dl`, {
+			method: 'POST',
+			body: requestBody,
+			referrer: window.location.href
+		});
+
+		let unpacked;
+
+		const responseText = await response.text();
+		const evalMatch = responseText.match(/eval\(function\(p,a,c,k,e,d\).*?(?=<\/script>)/gms)!;
+		// sometimes is packed, sometimes it's not. looks like someone forgets to obfuscate the code when pushing to
+		// production
+		if (evalMatch) {
+			unpacked = await unpack(evalMatch[0]);
+			return unpacked.match(/(?<=file:").*(?=")/)![0];
+		} else {
+			unpacked = responseText;
+		}
+
+		return unpacked.match(/(?<=file:").*(?=")/)![0];
 	}
 };
 
 export const Mixdrop: Match = {
 	name: 'Mixdrop',
 	id: 'mixdrop',
-	reliability: Reliability.HIGH,
-	domains: ['mixdrop.co', 'mixdrop.to', 'mixdrop.ch', 'mixdrop.bz', 'mixdrop.gl'],
-	regex: /eval\(function\(p,a,c,k,e,d\).*?(?=<\/script>)/gms,
+	domains: ['mixdrop.bz', 'mixdrop.ch', 'mixdrop.co', 'mixdrop.gl', 'mixdrop.my', 'mixdrop.to'],
+	regex: [/eval\(function\(p,a,c,k,e,d\).*?(?=<\/script>)/gms],
 
-	match: async (match: RegExpMatchArray) => {
+	match: async function (match: RegExpMatchArray) {
 		const unpacked = await unpack(match[0]);
-		const url = unpacked.match(/(?<=MDCore.wurl=").*(?=")/)[0];
+		const url = unpacked.match(/(?<=MDCore.wurl=").*(?=")/)![0];
 		return `https:${url}`;
 	}
 };
@@ -123,23 +194,21 @@ export const Mixdrop: Match = {
 export const Mp4Upload: Match = {
 	name: 'Mp4Upload',
 	id: 'mp4upload',
-	reliability: Reliability.HIGH,
 	domains: ['mp4upload.com'],
 	replace: true,
-	regex: /eval\(function\(p,a,c,k,e,d\).*?(?=<\/script>)/gms,
+	regex: [/eval\(function\(p,a,c,k,e,d\).*?(?=<\/script>)/gms],
 
-	match: async (match: RegExpMatchArray) => {
+	match: async function (match: RegExpMatchArray) {
 		const unpacked = await unpack(match[0]);
-		return unpacked.match(/(?<=player.src\(").*(?=")/)[0];
+		return unpacked.match(/(?<=player.src\(").*(?=")/)![0];
 	}
 };
 
 export const Newgrounds: Match = {
 	name: 'Newgrounds',
 	id: 'newgrounds',
-	reliability: Reliability.HIGH,
 	domains: ['newgrounds.com'],
-	regex: /.*/gm,
+	regex: [/.*/gm],
 
 	match: async () => {
 		const id = window.location.pathname.split('/').slice(-1)[0];
@@ -153,14 +222,28 @@ export const Newgrounds: Match = {
 	}
 };
 
+export const StreamA2z: Match = {
+	name: 'Stream2Az',
+	id: 'stream2az',
+	domains: ['streama2z.com', 'streama2z.xyz'],
+	regex: [/https?:\/\/\S*m3u8.+(?=['"])/gm],
+
+	match: async function (match: RegExpMatchArray) {
+		if (StreamA2z.domains.indexOf(window.location.hostname) !== -1) {
+			await Redirect.set(StreamA2z);
+			return null;
+		}
+		return match[0];
+	}
+};
+
 export const Streamtape: Match = {
 	name: 'Streamtape',
 	id: 'streamtape',
-	reliability: Reliability.HIGH,
 	domains: ['streamtape.com', 'streamtape.net', 'shavetape.cash'],
-	regex: /id=.*(?=')/gm,
+	regex: [/id=.*(?=')/gm],
 
-	match: async (match: RegExpMatchArray) => {
+	match: async function (match: RegExpMatchArray) {
 		let i = 0;
 		while (i < match.length) {
 			if (match[++i - 1] == match[i]) {
@@ -176,11 +259,10 @@ export const Streamtape: Match = {
 export const Streamzz: Match = {
 	name: 'Streamzz',
 	id: 'streamzz',
-	reliability: Reliability.LOW,
 	domains: ['streamzz.to', 'streamz.ws'],
-	regex: /(?<=\|)\w{2,}/gm,
+	regex: [/(?<=\|)\w{2,}/gm],
 
-	match: async (match: RegExpMatchArray) => {
+	match: async function (match: RegExpMatchArray) {
 		return `https://get.${location.hostname.split('.')[0]}.tw/getlink-${
 			match.sort((a, b) => b.length - a.length)[0]
 		}.dll`;
@@ -190,37 +272,47 @@ export const Streamzz: Match = {
 export const SuperVideo: Match = {
 	name: 'Supervideo',
 	id: 'supervideo',
-	reliability: Reliability.HIGH,
-	domains: ['supervideo.tv'],
-	regex: /eval\(function\(p,a,c,k,e,d\).*?(?=<\/script>)/gms,
+	domains: ['supervideo.cc', 'supervideo.tv'],
+	regex: [/eval\(function\(p,a,c,k,e,d\).*?(?=<\/script>)/gms],
 
-	match: async (match: RegExpMatchArray) => {
+	match: async function (match: RegExpMatchArray) {
 		const unpacked = await unpack(match[0]);
-		return unpacked.match(/(?<=file:").*(?=")/)[0];
+		return unpacked.match(/(?<=file:").*(?=")/)![0];
 	}
 };
 
 export const Upstream: Match = {
 	name: 'Upstream',
 	id: 'upstream',
-	reliability: Reliability.HIGH,
 	domains: ['upstream.to'],
-	regex: /eval\(function\(p,a,c,k,e,d\).*?(?=<\/script>)/gms,
+	regex: [/eval\(function\(p,a,c,k,e,d\).*?(?=<\/script>)/gms],
 
-	match: async (match: RegExpMatchArray) => {
+	match: async function (match: RegExpMatchArray) {
 		const unpacked = await unpack(match[0]);
-		return unpacked.match(/(?<=file:").*(?=")/)[0];
+		return unpacked.match(/(?<=file:").*(?=")/)![0];
+	}
+};
+
+export const Vidmoly: Match = {
+	name: 'Vidmoly',
+	id: 'vidmoly',
+	domains: ['vidmoly.me', 'vidmoly.to'],
+	regex: [/(?<=file:").+\.m3u8/gm],
+	replace: true,
+
+	match: async function (match: RegExpMatchArray) {
+		return match[0];
 	}
 };
 
 export const Vidoza: Match = {
 	name: 'Vidoza',
 	id: 'vidoza',
-	reliability: Reliability.HIGH,
-	domains: ['vidoza.net'],
-	regex: /(?<=src:\s?").+?(?=")/gm,
+	domains: ['vidoza.net', 'videzz.net'],
+	regex: [/(?<=src:\s?").+?(?=")/gm],
+	replace: true,
 
-	match: async (match: RegExpMatchArray) => {
+	match: async function (match: RegExpMatchArray) {
 		return match[0];
 	}
 };
@@ -228,23 +320,78 @@ export const Vidoza: Match = {
 export const Voe: Match = {
 	name: 'Voe',
 	id: 'voe',
-	reliability: Reliability.HIGH,
 	domains: ['voe.sx'],
-	regex: /https?:\/\/\S*m3u8.+(?=')/gm,
+	regex: [
+		// voe.sx
+		/(?<=window\.location\.href\s=\s')\S*(?=')/gm,
+		// whatever site voe.sx redirects to
+		/(?<=<script type="application\/json">).*(?=<\/script>)/m
+	],
 
-	match: async (match: RegExpMatchArray) => {
-		return match[0];
+	match: async function (match: RegExpMatchArray) {
+		if (window.location.host === 'voe.sx') {
+			const redirectUrl = new URL(match[0]);
+			await TmpHost.set(redirectUrl.host, Voe);
+			return null;
+		} else {
+			let json = match[0];
+			json = JSON.parse(json);
+
+			let deobfuscated = json[0];
+			deobfuscated = this.rot13(deobfuscated);
+			deobfuscated = this.removeSpecialSequences(deobfuscated);
+			deobfuscated = atob(deobfuscated);
+			deobfuscated = this.shiftString(deobfuscated);
+			deobfuscated = deobfuscated.split('').reverse().join('');
+			deobfuscated = atob(deobfuscated);
+
+			const payload = JSON.parse(deobfuscated);
+
+			return payload['source'];
+		}
+	},
+
+	rot13: function (encrypted: string) {
+		let decrypted = '';
+		for (let i = 0; i < encrypted.length; i++) {
+			let char = encrypted.charCodeAt(i);
+			if (char >= 65 && char <= 90) {
+				char = ((char - 65 + 13) % 26) + 65;
+			} else if (char >= 97 && char <= 122) {
+				char = ((char - 97 + 13) % 26) + 97;
+			}
+			decrypted += String.fromCharCode(char);
+		}
+		return decrypted;
+	},
+	removeSpecialSequences: function (input: string) {
+		return input
+			.replaceAll(/@\$/g, '')
+			.replaceAll(/\^\^/g, '')
+			.replaceAll(/~@/g, '')
+			.replaceAll(/%\?/g, '')
+			.replaceAll(/\*~/g, '')
+			.replaceAll(/!!/g, '')
+			.replaceAll(/#&/g, '');
+	},
+	shiftString: function (input: string) {
+		let shifted = '';
+		for (let i = 0; i < input.length; i++) {
+			const char = input.charCodeAt(i);
+			const shiftedChar = char - 3;
+			shifted += String.fromCharCode(shiftedChar);
+		}
+		return shifted;
 	}
 };
 
 export const Vupload: Match = {
 	name: 'Vupload',
 	id: 'vupload',
-	reliability: Reliability.HIGH,
 	domains: ['vupload.com'],
-	regex: /(?<=src:\s?").+?(?=")/gm,
+	regex: [/(?<=src:\s?").+?(?=")/gm],
 
-	match: async (match: RegExpMatchArray) => {
+	match: async function (match: RegExpMatchArray) {
 		return match[0];
 	}
 };
@@ -255,13 +402,17 @@ export const matches = {
 	[Filemoon.id]: Filemoon,
 	[GoodStream.id]: GoodStream,
 	[Kwik.id]: Kwik,
+	[LoadX.id]: LoadX,
+	[Luluvdo.id]: Luluvdo,
 	[Mixdrop.id]: Mixdrop,
 	[Mp4Upload.id]: Mp4Upload,
 	[Newgrounds.id]: Newgrounds,
+	[StreamA2z.id]: StreamA2z,
 	[Streamtape.id]: Streamtape,
 	[Streamzz.id]: Streamzz,
 	[SuperVideo.id]: SuperVideo,
 	[Upstream.id]: Upstream,
+	[Vidmoly.id]: Vidmoly,
 	[Vidoza.id]: Vidoza,
 	[Voe.id]: Voe,
 	[Vupload.id]: Vupload
@@ -281,5 +432,10 @@ export async function getMatch(domain: string): Promise<Match | null> {
 		}
 	}
 
+	const tmpHost = await TmpHost.get();
+	if (tmpHost && tmpHost[0] === domain) {
+		return tmpHost[1];
+	}
+
 	return null;
 }

src/lib/settings.ts

@@ -1,14 +1,12 @@
-import browser from 'webextension-polyfill';
-import type { Match } from '~/lib/match';
-import { matches } from '~/lib/match';
+import { matches, type Match } from './match';
 
 export const Hosters = {
 	getDisabled: async () => {
-		const disabled = await storageGet<string[]>('hosters.disabled', []);
+		const disabled = (await storageGet('hosters.disabled', [])) as string[];
 		return disabled.map((id) => matches[id]).filter((m) => m !== undefined);
 	},
 	disable: async (match: Match) => {
-		const disabled = await storageGet('hosters.disabled', []);
+		const disabled = (await storageGet('hosters.disabled', [])) as string[];
 		const index = disabled.indexOf(match.id);
 		if (index === -1) {
 			disabled.push(match.id);
@@ -16,7 +14,7 @@ export const Hosters = {
 		}
 	},
 	enable: async (match: Match) => {
-		const disabled = await storageGet('hosters.disabled', []);
+		const disabled = (await storageGet('hosters.disabled', [])) as string[];
 		const index = disabled.indexOf(match.id);
 		if (index !== -1) {
 			disabled.splice(index, 1);
@@ -26,17 +24,14 @@ export const Hosters = {
 	getAllDisabled: async () => {
 		return await storageGet<boolean>('hosters.allDisabled', false);
 	},
-	disableAll: async () => {
-		await storageSet('hosters.allDisabled', true);
-	},
-	enableAll: async () => {
-		await storageSet('hosters.allDisabled', false);
+	setAll: async (enable: boolean) => {
+		await storageSet('hosters.allDisabled', !enable);
 	}
 };
 
 export const Redirect = {
 	get: async (): Promise<Match | null> => {
-		return matches[await storageGet<string>('redirect')] || null;
+		return matches[(await storageGet('redirect')) as string] || null;
 	},
 	set: async (match: Match) => {
 		await storageSet('redirect', match.id);
@@ -46,28 +41,72 @@ export const Redirect = {
 	}
 };
 
+export const TmpHost = {
+	get: async (): Promise<[string, Match] | null> => {
+		const tmphost = await storageGet<[string, number]>('tmphost');
+		if (tmphost === undefined) {
+			return null;
+		}
+		return [tmphost[0], matches[tmphost[1]]];
+	},
+	set: async (domain: string, match: Match) => {
+		await storageSet('tmphost', [domain, match.id]);
+	},
+	delete: async () => {
+		await storageDelete('tmphost');
+	}
+};
+
+export const UrlReferer = {
+	get: async (url: string): Promise<string | null> => {
+		return (await storageGet(`urlReferer.${url}`)) || null;
+	},
+	set: async (url: string, referer: string) => {
+		await storageSet(`urlReferer.${url}`, referer);
+	},
+	delete: async (url: string) => {
+		await storageDelete(`urlReferer.${url}`);
+	}
+};
+
 export const Other = {
 	getFf2mpv: async () => {
-		return await storageGet('other.ff2mpv', true);
+		return await storageGet('other.ff2mpv', false);
 	},
 	setFf2mpv: async (enable: boolean) => {
 		await storageSet('other.ff2mpv', enable);
 	}
 };
 
-export async function storageGet<T>(key: string, defaultValue?: T): Promise<T | undefined> {
-	const entry = await browser.storage.local.get(key);
-	const value = entry[key];
-	return value === undefined ? defaultValue : value;
+async function storageGet<T>(key: string, defaultValue?: T): Promise<T | undefined> {
+	let resolve: (value: T | undefined) => void;
+	const promise = new Promise<T | undefined>((r) => (resolve = r));
+
+	chrome.storage.local.get(key, (entry) => {
+		const value = entry[key];
+		resolve(value === undefined ? defaultValue : value);
+	});
+
+	return promise;
 }
 
-export async function storageSet<T>(key: string, value: T) {
+async function storageSet<T>(key: string, value: T) {
+	let resolve: () => void;
+	const promise = new Promise<void>((r) => (resolve = r));
+
 	const obj = {
 		[key]: value
 	};
-	await browser.storage.local.set(obj);
+	chrome.storage.local.set(obj, () => resolve());
+
+	return promise;
 }
 
-export async function storageDelete(key: string) {
-	await browser.storage.local.remove(key);
+async function storageDelete(key: string) {
+	let resolve: () => void;
+	const promise = new Promise<void>((r) => (resolve = r));
+
+	chrome.storage.local.remove(key, () => resolve());
+
+	return promise;
 }

src/lib/util/extract.ts

@@ -0,0 +1,6 @@
+export function lastPathSegment(path: string): string {
+	while (path.endsWith('/')) {
+		path = path.slice(0, -1);
+	}
+	return path.substring(path.lastIndexOf('/') + 1);
+}

src/lib/util/userspace.ts

@@ -16,10 +16,10 @@ export async function unpack(packed: string): Promise<string> {
                 ${packed}
             };
             return packed;
-        }'
+        }
     `;
 
-	const res: string = await runInPageContext(toExecute);
+	const res = (await runInPageContext(toExecute)) as string;
 	return res
 		.replace(/;/g, ';\n')
 		.replace(/{/g, '\n{\n')
@@ -29,11 +29,12 @@ export async function unpack(packed: string): Promise<string> {
 }
 
 // Adapted from: https://github.com/arikw/extension-page-context
-async function runInPageContext<T>(toExecute: string): Promise<T> {
+async function runInPageContext<T>(toExecute: string): Promise<T | null> {
 	// test that we are running with the allow-scripts permission
 	try {
+		// eslint-disable-next-line @typescript-eslint/no-unused-expressions
 		window.sessionStorage;
-	} catch (ignore) {
+	} catch {
 		return null;
 	}
 
@@ -44,28 +45,25 @@ async function runInPageContext<T>(toExecute: string): Promise<T> {
 	const scriptElm = document.createElement('script');
 	scriptElm.setAttribute('type', 'application/javascript');
 
-	const code = `
+	// inject the script
+	scriptElm.textContent = `
         (
             async function () {
+				const response = {
+					id: '${resultMessageId}'
+				};
 
-                    const response = {
-                        id: ${resultMessageId}
-                    };
-
-                    try {
-                        response.result = JSON.stringify(await (${toExecute})() ); // run script
-                    } catch(err) {
-                        response.error = JSON.stringify(err);
-                    }
+				try {
+					response.result = JSON.stringify(await (${toExecute})() ); // run script
+				} catch(err) {
+					response.error = JSON.stringify(err);
+				}
             
-                    window.postMessage(response, '*');
+				window.postMessage(response, '*');
             }
         )();
     `;
 
-	// inject the script
-	scriptElm.textContent = code;
-
 	// run the script
 	document.documentElement.appendChild(scriptElm);
 

src/manifest.ts

@@ -1,15 +1,17 @@
 import pkg from '../package.json';
+import { matches } from './lib/match';
 
 const sharedManifest: Partial<chrome.runtime.ManifestBase> = {
 	browser_specific_settings: {
 		gecko: {
 			id: '{55dd42e8-3dd9-455a-b4fe-86664881b10c}'
-		}
+		},
+		gecko_android: {}
 	},
 	content_scripts: [
 		{
 			all_frames: true,
-			matches: ['<all_urls>'],
+			matches: Object.values(matches).flatMap((m) => m.domains.map((d) => `*://${d}/*`)),
 			js: ['src/entries/contentScript/main.ts'],
 			run_at: 'document_end'
 		}
@@ -21,7 +23,8 @@ const sharedManifest: Partial<chrome.runtime.ManifestBase> = {
 		96: 'icons/stream-bypass@96px.png',
 		128: 'icons/stream-bypass@128px.png'
 	},
-	permissions: ['storage', 'webRequest', 'nativeMessaging', '<all_urls>']
+	permissions: ['storage'],
+	optional_permissions: ['nativeMessaging']
 };
 
 const browserAction = {
@@ -35,18 +38,19 @@ const browserAction = {
 const ManifestV2 = {
 	...sharedManifest,
 	background: {
-		scripts: ['src/entries/background/main.ts'],
+		scripts: ['src/entries/background/mv2.ts'],
 		persistent: true
 	},
+	content_scripts: [{ ...sharedManifest.content_scripts![0], matches: ['<all_urls>'] }],
 	browser_action: browserAction,
-	permissions: [...sharedManifest.permissions]
+	permissions: [...sharedManifest.permissions, 'webRequest', 'webRequestBlocking', '<all_urls>']
 };
 
 const ManifestV3 = {
 	...sharedManifest,
 	action: browserAction,
 	background: {
-		service_worker: 'src/entries/background/main.ts'
+		service_worker: 'src/entries/background/mv3.ts'
 	}
 };
 
@@ -65,15 +69,18 @@ export function getManifest(
 			...manifest,
 			...ManifestV2,
 			manifest_version: manifestVersion
-		};
+		} as chrome.runtime.ManifestV2;
 	}
 
 	if (manifestVersion === 3) {
 		return {
 			...manifest,
+			// just like all the adblockers which are unable to fully work under MV3, we need access to every website
+			// the user enters in order to work correctly, which is forbidden when using MV3
+			name: `${manifest.name} Lite`,
 			...ManifestV3,
 			manifest_version: manifestVersion
-		};
+		} as chrome.runtime.ManifestV3;
 	}
 
 	throw new Error(`Missing manifest definition for manifestVersion ${manifestVersion}`);

tsconfig.json

@@ -2,7 +2,7 @@
 	"extends": "@tsconfig/svelte/tsconfig.json",
 	"compilerOptions": {
 		"allowSyntheticDefaultImports": true,
-		"target": "es2019",
+		"target": "es2021",
 		"module": "esnext",
 		"useDefineForClassFields": true,
 		"resolveJsonModule": true,

vite.config.ts

@@ -1,7 +1,8 @@
-import { defineConfig, loadEnv } from 'vite';
-import { svelte } from '@sveltejs/vite-plugin-svelte';
+import { fileURLToPath } from 'url';
 import webExtension from '@samrum/vite-plugin-web-extension';
-import path from 'path';
+import { svelte } from '@sveltejs/vite-plugin-svelte';
+import { defineConfig, loadEnv, type PluginOption } from 'vite';
+import { matches } from './src/lib/match';
 import { getManifest } from './src/manifest';
 
 // https://vitejs.dev/config/
@@ -10,7 +11,7 @@ export default defineConfig(({ mode }) => {
 
 	return {
 		plugins: [
-			svelte(),
+			svelte() as PluginOption,
 			webExtension({
 				manifest: getManifest(Number(env.MANIFEST_VERSION)),
 				additionalInputs: {
@@ -18,18 +19,18 @@ export default defineConfig(({ mode }) => {
 						{
 							fileName: 'src/entries/player/player.html',
 							webAccessible: {
-								matches: ['<all_urls>'],
-								excludeEntryFile: true
+								matches:
+									Number(env.MANIFEST_VERSION) === 3
+										? Object.values(matches).flatMap((m) => m.domains.map((d) => `*://${d}/*`))
+										: ['<all_urls>']
 							}
 						}
 					]
 				}
-			})
+			}) as unknown as PluginOption
 		],
 		resolve: {
-			alias: {
-				'~': path.resolve(__dirname, './src')
-			}
+			alias: [{ find: '~', replacement: fileURLToPath(new URL('./src', import.meta.url)) }]
 		}
 	};
 });