Update dependencies and version

Fix voe
Add mixdrop domain
2025-05-09 20:25:14 +02:00 · 2025-05-08 02:02:57 +02:00 · 2025-05-08 01:59:29 +02:00 · 2025-05-06 22:21:09 +02:00 · 2025-05-06 22:20:04 +02:00 · 2025-05-06 22:18:19 +02:00
63 changed files with 11149 additions and 1350 deletions
--- a/.env
+++ b/.env
@ -0,0 +1 @@
+MANIFEST_VERSION=2
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -0,0 +1,56 @@
+name: ci
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install nodejs
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+          cache: 'npm'
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Lint
+        run: npm run lint
+
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - manifest_version: 2
+          - manifest_version: 3
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install nodejs
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+          cache: 'npm'
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Build
+        env:
+          MANIFEST_VERSION: ${{ matrix.manifest_version }}
+        run: npm run build
+
+      - name: Upload
+        uses: actions/upload-artifact@v4
+        with:
+          name: stream-bypass-mv${{ matrix.manifest_version }}
+          path: ./dist
+          if-no-files-found: error
--- a/.gitignore
+++ b/.gitignore
@ -1,4 +1,4 @@
 .idea/
-build/
 dist/
+release/
 node_modules/
--- a/.npmrc
+++ b/.npmrc
@ -0,0 +1,2 @@
+auto-install-peers=false
+strict-peer-dependencies=false
--- a/.prettierignore
+++ b/.prettierignore
@ -0,0 +1,8 @@
+.DS_Store
+node_modules
+/dist
+.env
+.env.*
+!.env.example
+
+package-lock.json
--- a/.prettierrc.cjs
+++ b/.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
+};
--- a/README.md
+++ b/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>
  •
@ -47,122 +46,130 @@ Additionally, this enables you to download the video by right-clicking it and ju

 ## 📥 Installation

-### Firefox
+### Official browser stores

-Install the addon directly from the [firefox addon store](https://addons.mozilla.org/de/firefox/addon/stream-bypass/).
+The best way to install the extension are the official browser extension stores:

-### Chromium / Google Chrome
+- [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)

-1. Download the zipfile from the [latest release](https://smartrelease.bytedream.org/github/ByteDream/stream-bypass/stream_bypass-{tag}.zip) and unzip it (with [7zip](https://www.7-zip.org/) or something like that).
-2. Go into your browser and type `chrome://extensions` in the address bar.
-3. Turn the developer mode in the top right corner on.
-4. Click Load unpacked.
-5. Choose the cloned / unzipped directory.
+### Manual installation

-### Opera
+- Firefox
+  - Download `stream-bypass-<version>-mv2.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 `about:debugging#/runtime/this-firefox` in the address bar
+  - 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 `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

-1. Download the zipfile from the [latest release](https://smartrelease.bytedream.org/github/ByteDream/stream-bypass/stream_bypass-{tag}.zip) and unzip it (with [7zip](https://www.7-zip.org/) or something like that).
-2. Go into your browser and type `opera://extensions` in the address bar.
-3. Turn the developer mode in the top right corner on.
-4. Click Load unpacked.
-5. Choose the cloned / unzipped directory.
+## ✨ Features

-## 📜 Supported sites
+| 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)) | ✔      | ✔     | ❌                  |

-| 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)                                            | ✔         |                                                                                                              |
+- ✔️: 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.

 Requirements:
+
 - `npm` installed.
 - A copy of this repository and a shell / console open in the copied directory.

 If the requirements are satisfied, you can continue with the following commands:
+
 ```shell
 # 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.
 2. Select 'This Firefox' tab (maybe named different, depending on your language).
 3. Under `Temporary Extensions`, click `Load Temporary Add-on`.
 4. Choose any file in the directory where the compiled sources are.

-
 ## ⚙️ Settings

 ### <ins>ff2mpv: use mpv to directly play streams</ins>
+
 ff2mpv is located at this repository: https://github.com/woodruffw/ff2mpv

 Steps to get it set up:
-  - In the [Usage](https://github.com/woodruffw/ff2mpv#usage) section of the ff2mpv repository pick the installation instruction for your operating system (Linux/Windows/macOS; you do not need the browser addon).
-  - Scroll down to `Install manually`
-  - Follow instructions for Firefox/Chrome
-  - Edit the `ff2mpv.json` you created:
-    - Firefox: Add `{55dd42e8-3dd9-455a-b4fe-86664881b10c}` to `allowed_extensions` -> 
+
+- In the [Usage](https://github.com/woodruffw/ff2mpv#usage) section of the ff2mpv repository pick the installation instruction for your operating system (Linux/Windows/macOS; you do not need the browser addon).
+- Scroll down to `Install manually`
+- Follow instructions for Firefox/Chrome
+- Edit the `ff2mpv.json` you created:
+  - Firefox: Add `{55dd42e8-3dd9-455a-b4fe-86664881b10c}` to `allowed_extensions` ->
+    ```
+    "allowed_extensions": [
+      "ff2mpv@yossarian.net",
+      "{55dd42e8-3dd9-455a-b4fe-86664881b10c}"
+    ]
+    ```
+  - Chrome/Chromium:
+    - Go To: Settings -> Extensions
+    - Click on `Details` of the Stream Bypass extension and copy the ID
+    - Add `chrome-extension://ddfpfjomnakfckhmilacnbokdaknamdb/` to `allowed_origins` ->
      ```
-      "allowed_extensions": [
-        "ff2mpv@yossarian.net",
-        "{55dd42e8-3dd9-455a-b4fe-86664881b10c}"
+      "allowed_origins": [
+        "chrome-extension://ephjcajbkgplkjmelpglennepbpmdpjg/",
+        "chrome-extension://ddfpfjomnakfckhmilacnbokdaknamdb/"
      ]
      ```
-    - 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` ->
-        ```
-        "allowed_origins": [
-          "chrome-extension://ephjcajbkgplkjmelpglennepbpmdpjg/",
-          "chrome-extension://your-id-her/"
-        ]
-        ```
-

 ## ⚖ License

--- a/eslint.config.mjs
+++ b/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'
+		]
+	}
+);
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -1,40 +1,51 @@
 {
-  "name": "stream-bypass",
-  "version": "2.2.0",
-  "description": "Multi-browser addon for multiple streaming providers which redirects directly to the source video",
-  "main": "src/index.ts",
-  "scripts": {
-    "build": "node tasks/build.ts",
-    "bundle": "node tasks/build.ts && web-ext build -s build -a dist -o",
-    "bundle:all": "node tasks/build.ts && web-ext build -s build -a dist -o && web-ext sign -s build -a dist",
-    "check": "web-ext lint -s build"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/ByteDream/stream-bypass.git"
-  },
-  "author": "ByteDream",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/ByteDream/stream-bypass/issues"
-  },
-  "homepage": "https://github.com/ByteDream/stream-bypass#readme",
-  "devDependencies": {
-    "@rollup/plugin-commonjs": "^24.1.0",
-    "@rollup/plugin-node-resolve": "^15.0.2",
-    "@rollup/plugin-replace": "^5.0.2",
-    "@rollup/plugin-typescript": "^11.1.0",
-    "@types/chrome": "^0.0.234",
-    "@types/node-sass": "^4.11.2",
-    "@types/yazl": "^2.4.2",
-    "@typescript-eslint/eslint-plugin": "^5.27.1",
-    "@typescript-eslint/parser": "^5.27.1",
-    "eslint": "^8.17.0",
-    "hls.js": "^1.1.5",
-    "rollup": "^3.21.0",
-    "sass": "^1.62.1",
-    "tippy.js": "^6.3.7",
-    "typescript": "^5.0.4",
-    "web-ext": "^7.0.0"
-  }
+	"name": "stream-bypass",
+	"version": "3.1.6",
+	"displayName": "Stream Bypass",
+	"author": "bytedream",
+	"description": "Multi-browser addon for multiple streaming providers which redirects directly to the source video",
+	"scripts": {
+		"build": "vite build",
+		"watch": "vite build --watch --mode development --minify false",
+		"dev": "vite",
+		"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 . && 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"
+	},
+	"bugs": {
+		"url": "https://github.com/bytedream/stream-bypass/issues"
+	},
+	"devDependencies": {
+		"@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"
 }
--- a/public/icons/stream-bypass.svg
+++ b/public/icons/stream-bypass.svg
@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="738.248" height="738.248" viewBox="0 0 195.328 195.328"><path d="M108.902 30.525c-53.858 0-97.664 43.806-97.664 97.664 0 53.86 43.806 97.665 97.664 97.665 53.86 0 97.664-43.806 97.664-97.665 0-53.858-43.805-97.664-97.664-97.664zm0 13.434c46.6 0 84.23 37.632 84.23 84.23 0 46.6-37.63 84.23-84.23 84.23-46.599 0-84.232-37.63-84.232-84.23 0-46.598 37.633-84.23 84.232-84.23z" style="color:#000;fill:#000;-inkscape-stroke:none" transform="translate(-11.238 -30.525)"/><path d="M8.986 105.297v96.926l83.94-48.463-7.7-4.446zm10.266 17.781 53.143 30.682-53.143 30.681z" style="color:#000;fill:#000;-inkscape-stroke:none" transform="matrix(1.30853 0 0 1.30853 44.795 -103.534)"/><path d="M345.131 686.085c-122.49-10.29-225.617-86.136-271.115-199.397-9.596-23.888-15.72-47.197-20.05-76.315-2.763-18.58-2.76-64.116.004-82.784 7.5-50.64 23.648-93.74 49.956-133.33 39.979-60.166 96.484-103.56 164.472-126.311 53.98-18.063 110.354-21.415 165.476-9.838 82.83 17.396 153.434 65.363 200.69 136.344 10.702 16.073 25.836 46.006 32.68 64.634 6.703 18.242 13.106 43.275 16.28 63.647 2.098 13.461 2.487 20.483 2.534 45.734.06 31.25-.585 38.592-5.576 63.53-26.78 133.796-136.647 235.614-272.394 252.435-17.246 2.137-47.675 2.935-62.957 1.651zm77.476-197.054c113.33-65.435 206.175-119.33 206.322-119.767.277-.827-411.864-239.171-414.659-239.8-1.374-.31-1.586 31.672-1.586 239.605 0 227.996.097 239.938 1.934 239.45 1.063-.283 94.658-54.052 207.989-119.487z" style="fill:#fff;stroke:#000;stroke-width:5.46616" transform="scale(.26458)"/></svg>
--- a/public/icons/stream-bypass@128px.png
+++ b/public/icons/stream-bypass@128px.png
--- a/public/icons/stream-bypass@16px.png
+++ b/public/icons/stream-bypass@16px.png
--- a/public/icons/stream-bypass@32px.png
+++ b/public/icons/stream-bypass@32px.png
--- a/public/icons/stream-bypass@48px.png
+++ b/public/icons/stream-bypass@48px.png
--- a/public/icons/stream-bypass@96px.png
+++ b/public/icons/stream-bypass@96px.png
--- a/public/icons/stream-bypass_disabled.svg
+++ b/public/icons/stream-bypass_disabled.svg
@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="738.248" height="738.248" viewBox="0 0 195.328 195.328"><path d="M108.902 30.525c-53.858 0-97.664 43.806-97.664 97.664 0 53.86 43.806 97.665 97.664 97.665 53.86 0 97.664-43.806 97.664-97.665 0-53.858-43.805-97.664-97.664-97.664zm0 13.434c46.6 0 84.23 37.632 84.23 84.23 0 46.6-37.63 84.23-84.23 84.23-46.599 0-84.232-37.63-84.232-84.23 0-46.598 37.633-84.23 84.232-84.23z" style="color:#000;fill:#000;-inkscape-stroke:none" transform="translate(-11.238 -30.525)"/><path d="M8.986 105.297v96.926l83.94-48.463-7.7-4.446zm10.266 17.781 53.143 30.682-53.143 30.681z" style="color:#000;fill:#000;-inkscape-stroke:none" transform="matrix(1.30853 0 0 1.30853 44.795 -103.534)"/><path d="M345.131 686.085c-122.49-10.29-225.617-86.136-271.115-199.397-9.596-23.888-15.72-47.197-20.05-76.315-2.763-18.58-2.76-64.116.004-82.784 7.5-50.64 23.648-93.74 49.956-133.33 39.979-60.166 96.484-103.56 164.472-126.311 53.98-18.063 110.354-21.415 165.476-9.838 82.83 17.396 153.434 65.363 200.69 136.344 10.702 16.073 25.836 46.006 32.68 64.634 6.703 18.242 13.106 43.275 16.28 63.647 2.098 13.461 2.487 20.483 2.534 45.734.06 31.25-.585 38.592-5.576 63.53-26.78 133.796-136.647 235.614-272.394 252.435-17.246 2.137-47.675 2.935-62.957 1.651zm77.476-197.054c113.33-65.435 206.175-119.33 206.322-119.767.277-.827-411.864-239.171-414.659-239.8-1.374-.31-1.586 31.672-1.586 239.605 0 227.996.097 239.938 1.934 239.45 1.063-.283 94.658-54.052 207.989-119.487z" style="fill:gray;stroke:#000;stroke-width:5.46616" transform="scale(.26458)"/></svg>
--- a/public/icons/stream-bypass_disabled@128px.png
+++ b/public/icons/stream-bypass_disabled@128px.png
--- a/public/icons/stream-bypass_disabled@16px.png
+++ b/public/icons/stream-bypass_disabled@16px.png
--- a/public/icons/stream-bypass_disabled@32px.png
+++ b/public/icons/stream-bypass_disabled@32px.png
--- a/public/icons/stream-bypass_disabled@48px.png
+++ b/public/icons/stream-bypass_disabled@48px.png
--- a/public/icons/stream-bypass_disabled@96px.png
+++ b/public/icons/stream-bypass_disabled@96px.png
--- a/src/background.ts
+++ b/src/background.ts
@ -1,25 +0,0 @@
-import {getMatch} from "./match/match";
-import {storageDelete, storageGet, storageSet} from "./store/store";
-import {Match} from "./match/matches";
-
-chrome.runtime.onMessage.addListener((message, sender) => {
-    if (message.action == "ff2mpv") {
-        chrome.runtime.sendNativeMessage("ff2mpv", {url: message.url})
-            .catch((error) => {console.error(error)})
-    }
-})
-
-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).host)) !== undefined) {
-            await storageSet('redirect', match.id)
-        }
-    } else {
-        await storageDelete('redirect')
-    }
-}, {
-    urls: ['<all_urls>'],
-    types: ['main_frame', 'sub_frame']
-})
--- a/src/entries/background/mv2.ts
+++ b/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'] }
+);
--- a/src/entries/background/mv3.ts
+++ b/src/entries/background/mv3.ts
@ -0,0 +1 @@
+import './shared';
--- a/src/entries/background/shared.ts
+++ b/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 });
+	}
+});
--- a/src/entries/contentScript/main.ts
+++ b/src/entries/contentScript/main.ts
@ -0,0 +1,104 @@
+import { getMatch, MatchMediaType, type Match } from '~/lib/match';
+import { Other, Redirect } from '~/lib/settings';
+
+async function main() {
+	let match: Match | null;
+	let redirect = false;
+	if ((match = await getMatch(window.location.host)) === null) {
+		if ((match = await Redirect.get()) === null) {
+			return;
+		}
+		redirect = true;
+	}
+
+	// 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();
+	}
+
+	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 chrome.runtime.sendMessage({ action: 'ff2mpv', url: url });
+	}
+
+	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;
+
+		// add video player to document body
+		document.body.style.margin = '0';
+		document.body.append(player);
+	} else {
+		window.location.assign(
+			chrome.runtime.getURL(
+				`src/entries/player/player.html?id=${match.id}&url=${encodeURIComponent(url)}&domain=${
+					window.location.hostname
+				}&type=${urlType}`
+			)
+		);
+	}
+}
+
+main();
--- a/src/entries/player/Player.svelte
+++ b/src/entries/player/Player.svelte
@ -0,0 +1,65 @@
+<script lang="ts">
+	import { onMount } from 'svelte';
+	import { play } from '~/entries/player/player';
+
+	let errorMessage: string | null = $state(null);
+
+	let videoElem: HTMLVideoElement;
+
+	onMount(async () => {
+		try {
+			await play(videoElem);
+			videoElem.controls = true;
+		} catch (e) {
+			errorMessage = e as string;
+		}
+	});
+</script>
+
+<!-- svelte-ignore a11y_media_has_caption -->
+<video id="video" bind:this={videoElem}></video>
+{#if errorMessage}
+	<div id="message-container">
+		<p>
+			<!-- eslint-disable-next-line svelte/no-at-html-tags -->
+			{@html errorMessage}
+		</p>
+	</div>
+{/if}
+
+<!-- eslint-disable -->
+<style lang="scss" global>
+	body {
+		background-color: #131313;
+	}
+
+	html,
+	body,
+	video {
+		width: 100%;
+		height: 100%;
+		margin: 0;
+	}
+
+	video {
+		position: absolute;
+		top: 0;
+		left: 0;
+	}
+
+	#message-container {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		flex-direction: column;
+		color: white;
+		text-align: center;
+		height: 100%;
+
+		& a,
+		& a:visited {
+			color: inherit;
+			text-decoration: underline;
+		}
+	}
+</style>
--- a/src/entries/player/player.html
+++ b/src/entries/player/player.html
@ -0,0 +1,17 @@
+<!doctype html>
+<html lang="en">
+	<head>
+		<meta charset="UTF-8" />
+		<title>Stream Bypass</title>
+	</head>
+	<body>
+		<script type="module">
+			import { mount } from 'svelte';
+			import Player from '~/entries/player/Player.svelte';
+
+			mount(Player, {
+				target: document.body
+			});
+		</script>
+	</body>
+</html>
--- a/src/entries/player/player.ts
+++ b/src/entries/player/player.ts
@ -0,0 +1,47 @@
+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);
+
+	videoElem.src = url;
+}
+
+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,
+			xhrSetup: async (xhr: XMLHttpRequest, url: string) => {
+				await UrlReferer.set(new URL(url).hostname, domain);
+				xhr.open('GET', url);
+			}
+		});
+		hls.loadSource(url);
+		hls.attachMedia(videoElem);
+	} else {
+		throw 'Failed to play m3u8 video (hls is not supported). Try again or create a new issue <a href="https://github.com/ByteDream/stream-bypass/issues/new">here</a>';
+	}
+}
+
+export async function play(videoElem: HTMLVideoElement) {
+	const urlQuery = new URLSearchParams(window.location.search);
+	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) {
+		throw `Invalid id: ${id}. Please report this <a href="https://github.com/ByteDream/stream-bypass/issues">here</a>`;
+	}
+	document.title = `Stream Bypass (${domain})`;
+
+	if (type === MatchMediaType.Hls) {
+		await playHls(url, domain, videoElem);
+	} else if (type === MatchMediaType.Native) {
+		await playNative(url, domain, videoElem);
+	}
+}
--- a/src/entries/popup/Popup.svelte
+++ b/src/entries/popup/Popup.svelte
@ -0,0 +1,165 @@
+<script lang="ts">
+	import { matches, type Match } from '~/lib/match';
+	import { Hosters, Other } from '~/lib/settings';
+	import Toggle from './toggle.svelte';
+
+	let hostersEnabled: boolean;
+	let hosters: (Match & { active: boolean; disabled: boolean })[] = [];
+	(async () => {
+		hostersEnabled = !(await Hosters.getAllDisabled());
+
+		const disabled = await Hosters.getDisabled();
+		hosters = Object.values(matches).map((m: any) => {
+			m['active'] = disabled.findIndex((p) => p.id == m.id) == -1;
+			return m;
+		}) as typeof hosters;
+	})();
+
+	let isMobile: boolean;
+	(async () => {
+		isMobile = (await browser.runtime.getPlatformInfo()).os === 'android';
+	})();
+
+	let ff2mpvEnabled: boolean;
+	(async () => {
+		ff2mpvEnabled = (await Other.getFf2mpv()) as boolean;
+	})();
+</script>
+
+<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);
+							} else {
+								await Hosters.disable(hoster);
+							}
+						}}
+					></Toggle>
+				</div>
+			{/each}
+		</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
+					>
+				</div>
+			</div>
+		</fieldset>
+	{/if}
+	<a id="report-notice" href="https://github.com/ByteDream/stream-bypass/issues"
+		>Report issues or requests</a
+	>
+</main>
+
+<!-- eslint-disable -->
+<style lang="scss" global>
+	body {
+		background-color: #2b2a33;
+		color: white;
+		font-weight: bold;
+		margin: 0;
+		padding: 0 8px;
+	}
+
+	fieldset {
+		border-radius: 5px;
+		border-color: gray;
+	}
+
+	#report-notice {
+		border: none;
+		color: white;
+		display: block;
+		font-weight: lighter;
+		font-size: 0.8rem;
+		text-align: center;
+		padding: 5px 0;
+	}
+
+	.settings {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		margin: 10px 0;
+	}
+
+	.header {
+		font-size: 16px;
+		margin: 5px 0;
+		text-align: center;
+	}
+
+	.setting-container {
+		display: grid;
+		grid-template-columns: auto auto;
+		grid-column-gap: 5px;
+		grid-row-gap: 4px;
+		align-items: end;
+		width: 100%;
+
+		& > label {
+			height: 34px;
+			margin: 0;
+			user-select: none;
+			cursor: pointer;
+			display: flex;
+			align-items: center;
+		}
+
+		& > hr {
+			grid-column: 1 / span 2;
+			width: 100%;
+		}
+	}
+
+	.info-questionmark {
+		display: inline-block;
+		transform: translateX(-40%) translateY(-100%);
+		color: black;
+		text-decoration: none;
+	}
+</style>
--- a/src/entries/popup/index.html
+++ b/src/entries/popup/index.html
@ -0,0 +1,18 @@
+<!doctype html>
+<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="overflow-y: scroll">
+		<script type="module">
+			import { mount } from 'svelte';
+			import Popup from '~/entries/popup/Popup.svelte';
+
+			mount(Popup, {
+				target: document.body
+			});
+		</script>
+	</body>
+</html>
--- a/src/entries/popup/toggle.svelte
+++ b/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>
--- a/src/icons/disabled.svg
+++ b/src/icons/disabled.svg
@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="195.32812mm"
-   height="195.32812mm"
-   viewBox="0 0 195.32812 195.32812"
-   version="1.1"
-   id="svg5"
-   inkscape:version="1.2 (dc2aedaf03, 2022-05-15)"
-   sodipodi:docname="logo-disabled.svg"
-   inkscape:export-filename="disabled_128.png"
-   inkscape:export-xdpi="16.644812"
-   inkscape:export-ydpi="16.644812"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview7"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:document-units="mm"
-     showgrid="false"
-     inkscape:zoom="0.90509668"
-     inkscape:cx="428.68349"
-     inkscape:cy="362.94465"
-     inkscape:window-width="1920"
-     inkscape:window-height="1015"
-     inkscape:window-x="0"
-     inkscape:window-y="36"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs2">
-    <inkscape:path-effect
-       effect="powerstroke"
-       id="path-effect3140"
-       is_visible="true"
-       lpeversion="1"
-       offset_points="3,0"
-       not_jump="false"
-       sort_points="true"
-       interpolator_type="CubicBezierJohan"
-       interpolator_beta="0.2"
-       start_linecap_type="zerowidth"
-       linejoin_type="extrp_arc"
-       miter_limit="4"
-       scale_width="1"
-       end_linecap_type="zerowidth" />
-  </defs>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-11.238281,-30.525391)">
-    <path
-       style="color:#000000;fill:#000000;-inkscape-stroke:none"
-       d="m 108.90234,30.525391 c -53.858772,0 -97.664059,43.805286 -97.664059,97.664059 0,53.85878 43.805287,97.66407 97.664059,97.66407 53.85878,0 97.66407,-43.80529 97.66407,-97.66407 0,-53.858773 -43.80529,-97.664059 -97.66407,-97.664059 z m 0,13.433593 c 46.59895,0 84.23047,37.631526 84.23047,84.230466 0,46.59895 -37.63152,84.23047 -84.23047,84.23047 -46.59894,0 -84.232418,-37.63152 -84.232418,-84.23047 0,-46.59894 37.633478,-84.230466 84.232418,-84.230466 z"
-       id="path2592" />
-    <path
-       style="color:#000000;fill:#000000;-inkscape-stroke:none"
-       d="m 8.9863281,105.29688 v 96.92578 l 83.9394529,-48.46289 -7.699219,-4.44532 z m 10.2656249,17.78125 53.142578,30.68164 -53.142578,30.68164 z"
-       id="path2646"
-       transform="matrix(1.3085265,0,0,1.3085265,56.033246,-73.00885)" />
-    <path
-       style="fill:#808080;stroke:#000000;stroke-width:5.46616"
-       d="M 345.13114,686.08528 C 222.64086,675.79533 119.51392,599.94853 74.016249,486.68834 64.419992,462.79978 58.296197,439.49115 53.966274,410.37335 51.203358,391.79333 51.205528,346.25661 53.970219,327.58931 61.4703,276.94849 77.618278,233.84988 103.92601,194.25835 143.90493,134.09253 200.40964,90.698198 268.39759,67.947934 322.37862,49.884696 378.75198,46.533168 433.87378,58.109989 c 82.82951,17.396066 153.43381,65.362801 200.69115,136.344381 10.701,16.07313 25.83502,46.0053 32.67962,64.63397 6.70243,18.2417 13.10531,43.27443 16.2797,63.64715 2.0974,13.46078 2.48648,20.4825 2.53407,45.73343 0.0589,31.24975 -0.58565,38.59247 -5.57665,63.52913 -26.77909,133.797 -136.64661,235.61462 -272.39375,252.4357 -17.24628,2.13706 -47.67501,2.9353 -62.95678,1.65153 z M 422.60679,489.0315 C 535.93722,423.59631 628.78214,369.70078 628.92885,369.26367 629.20612,368.43746 217.06471,130.09256 214.27041,129.46316 c -1.37426,-0.30954 -1.58595,31.67289 -1.58595,239.60604 0,227.99566 0.0965,239.93763 1.9335,239.44933 1.06342,-0.28267 94.65839,-54.05183 207.98883,-119.48703 z"
-       id="path2606"
-       transform="matrix(0.26458333,0,0,0.26458333,11.238281,30.525391)" />
-  </g>
-</svg>
--- a/src/icons/disabled_128.png
+++ b/src/icons/disabled_128.png
--- a/src/icons/disabled_48.png
+++ b/src/icons/disabled_48.png
--- a/src/icons/logo.svg
+++ b/src/icons/logo.svg
@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="195.32812mm"
-   height="195.32812mm"
-   viewBox="0 0 195.32812 195.32812"
-   version="1.1"
-   id="svg5"
-   inkscape:version="1.2 (dc2aedaf03, 2022-05-15)"
-   sodipodi:docname="logo.svg"
-   inkscape:export-filename="logo_128.png"
-   inkscape:export-xdpi="16.644812"
-   inkscape:export-ydpi="16.644812"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview7"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:document-units="mm"
-     showgrid="false"
-     inkscape:zoom="0.90509668"
-     inkscape:cx="198.32136"
-     inkscape:cy="397.19514"
-     inkscape:window-width="1920"
-     inkscape:window-height="1015"
-     inkscape:window-x="1920"
-     inkscape:window-y="36"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs2">
-    <inkscape:path-effect
-       effect="powerstroke"
-       id="path-effect3140"
-       is_visible="true"
-       lpeversion="1"
-       offset_points="3,0"
-       not_jump="false"
-       sort_points="true"
-       interpolator_type="CubicBezierJohan"
-       interpolator_beta="0.2"
-       start_linecap_type="zerowidth"
-       linejoin_type="extrp_arc"
-       miter_limit="4"
-       scale_width="1"
-       end_linecap_type="zerowidth" />
-  </defs>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-11.238281,-30.525391)">
-    <path
-       style="color:#000000;fill:#000000;-inkscape-stroke:none"
-       d="m 108.90234,30.525391 c -53.858772,0 -97.664059,43.805286 -97.664059,97.664059 0,53.85878 43.805287,97.66407 97.664059,97.66407 53.85878,0 97.66407,-43.80529 97.66407,-97.66407 0,-53.858773 -43.80529,-97.664059 -97.66407,-97.664059 z m 0,13.433593 c 46.59895,0 84.23047,37.631526 84.23047,84.230466 0,46.59895 -37.63152,84.23047 -84.23047,84.23047 -46.59894,0 -84.232418,-37.63152 -84.232418,-84.23047 0,-46.59894 37.633478,-84.230466 84.232418,-84.230466 z"
-       id="path2592" />
-    <path
-       style="color:#000000;fill:#000000;-inkscape-stroke:none"
-       d="m 8.9863281,105.29688 v 96.92578 l 83.9394529,-48.46289 -7.699219,-4.44532 z m 10.2656249,17.78125 53.142578,30.68164 -53.142578,30.68164 z"
-       id="path2646"
-       transform="matrix(1.3085265,0,0,1.3085265,56.033246,-73.00885)" />
-    <path
-       style="fill:#ffffff;stroke:#000000;stroke-width:5.46616"
-       d="M 345.13114,686.08528 C 222.64086,675.79533 119.51392,599.94853 74.016249,486.68834 64.419992,462.79978 58.296197,439.49115 53.966274,410.37335 51.203358,391.79333 51.205528,346.25661 53.970219,327.58931 61.4703,276.94849 77.618278,233.84988 103.92601,194.25835 143.90493,134.09253 200.40964,90.698198 268.39759,67.947933 322.37862,49.884696 378.75198,46.533168 433.87378,58.109989 c 82.82951,17.396066 153.43381,65.362801 200.69115,136.344371 10.701,16.07314 25.83502,46.00531 32.67962,64.63398 6.70243,18.2417 13.10531,43.27443 16.2797,63.64715 2.0974,13.46078 2.48648,20.4825 2.53407,45.73343 0.0589,31.24975 -0.58565,38.59247 -5.57665,63.52913 -26.7791,133.797 -136.64661,235.61462 -272.39375,252.43569 -17.24628,2.13707 -47.67501,2.9353 -62.95678,1.65154 z M 422.60679,489.0315 C 535.93722,423.59631 628.78214,369.70078 628.92885,369.26367 629.20612,368.43746 217.06471,130.09256 214.27041,129.46316 c -1.37426,-0.30954 -1.58595,31.67289 -1.58595,239.60604 0,227.99566 0.0965,239.93763 1.9335,239.44933 1.06342,-0.28267 94.65839,-54.05183 207.98883,-119.48703 z"
-       id="path374"
-       transform="matrix(0.26458333,0,0,0.26458333,11.238281,30.525391)" />
-  </g>
-</svg>
--- a/src/icons/logo_128.png
+++ b/src/icons/logo_128.png
--- a/src/icons/logo_48.png
+++ b/src/icons/logo_48.png
--- a/src/index.ts
+++ b/src/index.ts
@ -1,42 +0,0 @@
-import {getMatch} from "./match/match";
-import {storageDelete, storageGet, getSetting} from "./store/store";
-import {Match, matches} from "./match/matches";
-
-async function main() {
-    let match: Match;
-    let redirect = false;
-    if ((match = await getMatch(window.location.host)) === undefined) {
-        let id: string
-        if ((id = await storageGet('redirect')) !== undefined) {
-            redirect = true
-            match = matches.find(m => m.id === id)
-        } else {
-            return
-        }
-    }
-
-    const re = document.body.innerHTML.match(match.regex)
-    if (re === null) return
-    if (redirect) await storageDelete('redirect')
-
-    const url = await match.match(re)
-
-    if (await getSetting("ff2mpv")) {
-        chrome.runtime.sendMessage({action: "ff2mpv", url: url})
-    }
-
-    if (match.replace && !url.includes('.m3u8')) {
-        const player = document.createElement('video')
-        player.style.width = '100%'
-        player.style.height = '100%'
-        player.controls = true
-        player.src = url
-
-        document.body.innerHTML = ''
-        document.body.append(player)
-    } else {
-        window.location.assign(chrome.runtime.getURL(`ui/player/player.html?id=${match.id}&url=${encodeURIComponent(url)}&domain=${window.location.host}`))
-    }
-}
-
-main()
--- a/src/lib/match.ts
+++ b/src/lib/match.ts
@ -0,0 +1,441 @@
+import { Hosters, Redirect, TmpHost } from './settings';
+import { lastPathSegment } from './util/extract';
+import { unpack } from './util/userspace';
+
+export interface Match {
+	name: string;
+	id: string;
+	domains: string[];
+	replace?: boolean;
+	regex: RegExp[];
+	notice?: 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',
+	domains: [
+		'doodstream.com',
+		'dood.pm',
+		'dood.ws',
+		'dood.wf',
+		'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',
+		'd000d.com'
+	],
+	replace: true,
+	regex: [/(\/pass_md5\/.*?)'.*(\?token=.*?expiry=)/s],
+
+	match: async function (match: RegExpMatchArray) {
+		const response = await fetch(`https://${window.location.host}${match[1]}`, {
+			headers: {
+				Range: 'bytes=0-'
+			},
+			referrer: `https://${window.location.host}/e/${
+				window.location.pathname.split('/').slice(-1)[0]
+			}`
+		});
+		return `${await response.text()}1234567890${match[2]}${Date.now()}`;
+	}
+};
+
+export const DropLoad: Match = {
+	name: 'Dropload',
+	id: 'dropload',
+	domains: ['dropload.io'],
+	regex: [/eval\(function\(p,a,c,k,e,d\).*?(?=<\/script>)/gms],
+
+	match: async function (match: RegExpMatchArray) {
+		const unpacked = await unpack(match[0]);
+		return unpacked.match(/(?<=file:").*(?=")/)![0];
+	}
+};
+
+export const Filemoon: Match = {
+	name: 'Filemoon',
+	id: 'filemoon',
+	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();
+
+		const unpacked = await unpack(match[0]);
+		return unpacked.match(/(?<=file:")\S*(?=")/)![0];
+	}
+};
+
+export const GoodStream: Match = {
+	name: 'Goodstream',
+	id: 'goodstream',
+	domains: ['goodstream.uno'],
+	regex: [/(?<=file:\s+").*(?=")/g],
+
+	match: async function (match: RegExpMatchArray) {
+		return match[0];
+	}
+};
+
+export const Kwik: Match = {
+	name: 'Kwik',
+	id: 'kwik',
+	domains: ['kwik.cx'],
+	regex: [/eval\(function\(p,a,c,k,e,d\).*?(?=<\/script>)/gms],
+
+	match: async function (match: RegExpMatchArray) {
+		const unpacked = await unpack(match[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',
+	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 function (match: RegExpMatchArray) {
+		const unpacked = await unpack(match[0]);
+		const url = unpacked.match(/(?<=MDCore.wurl=").*(?=")/)![0];
+		return `https:${url}`;
+	}
+};
+
+export const Mp4Upload: Match = {
+	name: 'Mp4Upload',
+	id: 'mp4upload',
+	domains: ['mp4upload.com'],
+	replace: true,
+	regex: [/eval\(function\(p,a,c,k,e,d\).*?(?=<\/script>)/gms],
+
+	match: async function (match: RegExpMatchArray) {
+		const unpacked = await unpack(match[0]);
+		return unpacked.match(/(?<=player.src\(").*(?=")/)![0];
+	}
+};
+
+export const Newgrounds: Match = {
+	name: 'Newgrounds',
+	id: 'newgrounds',
+	domains: ['newgrounds.com'],
+	regex: [/.*/gm],
+
+	match: async () => {
+		const id = window.location.pathname.split('/').slice(-1)[0];
+		const response = await fetch(`https://www.newgrounds.com/portal/video/${id}`, {
+			headers: {
+				'X-Requested-With': 'XMLHttpRequest'
+			}
+		});
+		const json = await response.json();
+		return decodeURI(json['sources'][Object.keys(json['sources'])[0]][0]['src']);
+	}
+};
+
+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',
+	domains: ['streamtape.com', 'streamtape.net', 'shavetape.cash'],
+	regex: [/id=.*(?=')/gm],
+
+	match: async function (match: RegExpMatchArray) {
+		let i = 0;
+		while (i < match.length) {
+			if (match[++i - 1] == match[i]) {
+				return `https://streamtape.com/get_video?${match[i]}`;
+			}
+		}
+
+		// use the old method as fallback
+		return `https://streamtape.com/get_video?${match.reverse()[0]}`;
+	}
+};
+
+export const Streamzz: Match = {
+	name: 'Streamzz',
+	id: 'streamzz',
+	domains: ['streamzz.to', 'streamz.ws'],
+	regex: [/(?<=\|)\w{2,}/gm],
+
+	match: async function (match: RegExpMatchArray) {
+		return `https://get.${location.hostname.split('.')[0]}.tw/getlink-${
+			match.sort((a, b) => b.length - a.length)[0]
+		}.dll`;
+	}
+};
+
+export const SuperVideo: Match = {
+	name: 'Supervideo',
+	id: 'supervideo',
+	domains: ['supervideo.cc', 'supervideo.tv'],
+	regex: [/eval\(function\(p,a,c,k,e,d\).*?(?=<\/script>)/gms],
+
+	match: async function (match: RegExpMatchArray) {
+		const unpacked = await unpack(match[0]);
+		return unpacked.match(/(?<=file:").*(?=")/)![0];
+	}
+};
+
+export const Upstream: Match = {
+	name: 'Upstream',
+	id: 'upstream',
+	domains: ['upstream.to'],
+	regex: [/eval\(function\(p,a,c,k,e,d\).*?(?=<\/script>)/gms],
+
+	match: async function (match: RegExpMatchArray) {
+		const unpacked = await unpack(match[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',
+	domains: ['vidoza.net', 'videzz.net'],
+	regex: [/(?<=src:\s?").+?(?=")/gm],
+	replace: true,
+
+	match: async function (match: RegExpMatchArray) {
+		return match[0];
+	}
+};
+
+export const Voe: Match = {
+	name: 'Voe',
+	id: 'voe',
+	domains: ['voe.sx'],
+	regex: [
+		// voe.sx
+		/(?<=window\.location\.href\s=\s')\S*(?=')/gm,
+		// whatever site voe.sx redirects to
+		/(?<=<script type="application\/json">).*(?=<\/script>)/m
+	],
+
+	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',
+	domains: ['vupload.com'],
+	regex: [/(?<=src:\s?").+?(?=")/gm],
+
+	match: async function (match: RegExpMatchArray) {
+		return match[0];
+	}
+};
+
+export const matches = {
+	[Doodstream.id]: Doodstream,
+	[DropLoad.id]: DropLoad,
+	[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
+};
+
+export async function getMatch(domain: string): Promise<Match | null> {
+	if (await Hosters.getAllDisabled()) {
+		return null;
+	}
+
+	for (const match of Object.values(matches)) {
+		if (
+			match.domains.indexOf(domain) !== -1 &&
+			!(await Hosters.getDisabled().then((d) => d.find((p) => p.id == match.id)))
+		) {
+			return match;
+		}
+	}
+
+	const tmpHost = await TmpHost.get();
+	if (tmpHost && tmpHost[0] === domain) {
+		return tmpHost[1];
+	}
+
+	return null;
+}
--- a/src/lib/settings.ts
+++ b/src/lib/settings.ts
@ -0,0 +1,112 @@
+import { matches, type Match } from './match';
+
+export const Hosters = {
+	getDisabled: async () => {
+		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', [])) as string[];
+		const index = disabled.indexOf(match.id);
+		if (index === -1) {
+			disabled.push(match.id);
+			await storageSet('hosters.disabled', disabled);
+		}
+	},
+	enable: async (match: Match) => {
+		const disabled = (await storageGet('hosters.disabled', [])) as string[];
+		const index = disabled.indexOf(match.id);
+		if (index !== -1) {
+			disabled.splice(index, 1);
+			await storageSet('hosters.disabled', disabled);
+		}
+	},
+	getAllDisabled: async () => {
+		return await storageGet<boolean>('hosters.allDisabled', false);
+	},
+	setAll: async (enable: boolean) => {
+		await storageSet('hosters.allDisabled', !enable);
+	}
+};
+
+export const Redirect = {
+	get: async (): Promise<Match | null> => {
+		return matches[(await storageGet('redirect')) as string] || null;
+	},
+	set: async (match: Match) => {
+		await storageSet('redirect', match.id);
+	},
+	delete: async () => {
+		await storageDelete('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', false);
+	},
+	setFf2mpv: async (enable: boolean) => {
+		await storageSet('other.ff2mpv', enable);
+	}
+};
+
+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;
+}
+
+async function storageSet<T>(key: string, value: T) {
+	let resolve: () => void;
+	const promise = new Promise<void>((r) => (resolve = r));
+
+	const obj = {
+		[key]: value
+	};
+	chrome.storage.local.set(obj, () => resolve());
+
+	return promise;
+}
+
+async function storageDelete(key: string) {
+	let resolve: () => void;
+	const promise = new Promise<void>((r) => (resolve = r));
+
+	chrome.storage.local.remove(key, () => resolve());
+
+	return promise;
+}
--- a/src/lib/util/extract.ts
+++ b/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);
+}
--- a/src/lib/util/userspace.ts
+++ b/src/lib/util/userspace.ts
@ -0,0 +1,92 @@
+// Adapted from http://matthewfl.com/unPacker.html by matthew@matthewfl.com
+export async function unpack(packed: string): Promise<string> {
+	const context = `
+		{
+			eval: function (c) {
+				packed = c;
+			},
+			window: {},
+			document: {}
+		}
+	`;
+	const toExecute = `
+        function() {
+            let packed = "";
+            with(${context}) {
+                ${packed}
+            };
+            return packed;
+        }
+    `;
+
+	const res = (await runInPageContext(toExecute)) as string;
+	return res
+		.replace(/;/g, ';\n')
+		.replace(/{/g, '\n{\n')
+		.replace(/}/g, '\n}\n')
+		.replace(/\n;\n/g, ';\n')
+		.replace(/\n\\n/g, '\n');
+}
+
+// Adapted from: https://github.com/arikw/extension-page-context
+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 {
+		return null;
+	}
+
+	// returned value container
+	const resultMessageId = crypto.randomUUID();
+
+	// prepare script container
+	const scriptElm = document.createElement('script');
+	scriptElm.setAttribute('type', 'application/javascript');
+
+	// inject the script
+	scriptElm.textContent = `
+        (
+            async function () {
+				const response = {
+					id: '${resultMessageId}'
+				};
+
+				try {
+					response.result = JSON.stringify(await (${toExecute})() ); // run script
+				} catch(err) {
+					response.error = JSON.stringify(err);
+				}
+            
+				window.postMessage(response, '*');
+            }
+        )();
+    `;
+
+	// run the script
+	document.documentElement.appendChild(scriptElm);
+
+	// clean up script element
+	scriptElm.remove();
+
+	let resolve: (value: T) => void;
+	let reject: (value: any) => void;
+	const promise = new Promise<T>((res, rej) => {
+		resolve = res;
+		reject = rej;
+	});
+	function onResult(event: MessageEvent) {
+		if (event.data.id === resultMessageId) {
+			window.removeEventListener('message', onResult);
+			if (event.data.error !== undefined) {
+				return reject(JSON.parse(event.data.error));
+			}
+			return resolve(event.data.result !== undefined ? JSON.parse(event.data.result) : undefined);
+		}
+	}
+
+	window.addEventListener('message', onResult);
+
+	return await promise;
+}
--- a/src/manifest.json
+++ b/src/manifest.json
@ -1,51 +0,0 @@
-{
-  "manifest_version": 2,
-  "name": "Stream Bypass",
-  "author": "ByteDream",
-  "description": "A multi-browser addon / extension for multiple streaming providers which redirects directly to the source video.",
-  "version": "2.2.0",
-  "homepage_url": "https://github.com/ByteDream/stream-bypass",
-  "browser_specific_settings": {
-    "gecko": {
-      "id": "{55dd42e8-3dd9-455a-b4fe-86664881b10c}"
-    }
-  },
-  "content_scripts": [
-    {
-      "all_frames": true,
-      "matches": [
-        "<all_urls>"
-      ],
-      "js": [
-        "index.js"
-      ],
-      "run_at": "document_end"
-    }
-  ],
-  "background": {
-    "scripts": [
-      "background.js"
-    ]
-  },
-  "permissions": [
-    "storage",
-    "webRequest",
-    "nativeMessaging",
-    "<all_urls>"
-  ],
-  "web_accessible_resources": [
-    "ui/player/*"
-  ],
-  "browser_action": {
-    "default_icon": {
-      "48": "icons/logo_48.png",
-      "128": "icons/logo_128.png"
-    },
-    "default_title": "Stream Bypass",
-    "default_popup": "ui/popup/popup.html"
-  },
-  "icons": {
-    "48": "icons/logo_48.png",
-    "128": "icons/logo_128.png"
-  }
-}
--- a/src/manifest.ts
+++ b/src/manifest.ts
@ -0,0 +1,87 @@
+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: Object.values(matches).flatMap((m) => m.domains.map((d) => `*://${d}/*`)),
+			js: ['src/entries/contentScript/main.ts'],
+			run_at: 'document_end'
+		}
+	],
+	icons: {
+		16: 'icons/stream-bypass@16px.png',
+		32: 'icons/stream-bypass@32px.png',
+		48: 'icons/stream-bypass@48px.png',
+		96: 'icons/stream-bypass@96px.png',
+		128: 'icons/stream-bypass@128px.png'
+	},
+	permissions: ['storage'],
+	optional_permissions: ['nativeMessaging']
+};
+
+const browserAction = {
+	default_icon: {
+		16: 'icons/stream-bypass@16px.png',
+		32: 'icons/stream-bypass@32px.png'
+	},
+	default_popup: 'src/entries/popup/index.html'
+};
+
+const ManifestV2 = {
+	...sharedManifest,
+	background: {
+		scripts: ['src/entries/background/mv2.ts'],
+		persistent: true
+	},
+	content_scripts: [{ ...sharedManifest.content_scripts![0], matches: ['<all_urls>'] }],
+	browser_action: browserAction,
+	permissions: [...sharedManifest.permissions, 'webRequest', 'webRequestBlocking', '<all_urls>']
+};
+
+const ManifestV3 = {
+	...sharedManifest,
+	action: browserAction,
+	background: {
+		service_worker: 'src/entries/background/mv3.ts'
+	}
+};
+
+export function getManifest(
+	manifestVersion: number
+): chrome.runtime.ManifestV2 | chrome.runtime.ManifestV3 {
+	const manifest = {
+		author: pkg.author,
+		description: pkg.description,
+		name: pkg.displayName ?? pkg.name,
+		version: pkg.version
+	};
+
+	if (manifestVersion === 2) {
+		return {
+			...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}`);
+}
--- a/src/match/match.ts
+++ b/src/match/match.ts
@ -1,14 +0,0 @@
-import {Match, matches} from "./matches";
-import {getAllDisabled, getDisabled} from "../store/store";
-
-export async function getMatch(host: string): Promise<Match | undefined> {
-    if (await getAllDisabled()) {
-        return undefined
-    }
-
-    for (const match of matches) {
-        if (match.domains.some(v => host.indexOf(v) !== -1) && !((await getDisabled()).some(v => v === match))) {
-            return match
-        }
-    }
-}
--- a/src/match/matches.ts
+++ b/src/match/matches.ts
@ -1,294 +0,0 @@
-import {unPack} from "./unpack";
-
-export enum Reliability {
-    HIGH,
-    NORMAL,
-    LOW,
-}
-
-export abstract class Match {
-    name: string
-    id: string
-    reliability: Reliability
-    domains: string[]
-    replace?: boolean
-    regex: RegExp
-    abstract match(match: RegExpMatchArray): Promise<string>
-
-    notice?: string
-}
-
-class Doodstream implements Match {
-    name = 'Doodstream'
-    id = 'doodstream'
-    reliability = Reliability.NORMAL
-    domains = [
-        'doodstream.com',
-        'dood.pm',
-        'dood.ws',
-        'dood.wf',
-        'dood.cx',
-        'dood.sh',
-        'dood.watch',
-        'dood.to',
-        'dood.so',
-        'dood.la',
-        'dood.re'
-    ]
-    replace = true
-    regex = new RegExp(/(\/pass_md5\/.*?)'.*(\?token=.*?expiry=)/s)
-
-    async match(match: RegExpMatchArray): Promise<string> {
-        const response = await fetch(`https://${window.location.host}${match[1]}`, {
-            headers: {
-                'Range': 'bytes=0-'
-            },
-            referrer: `https://${window.location.host}/e/${window.location.pathname.split('/').slice(-1)[0]}`,
-        });
-
-        return `${await response.text()}1234567890${match[2]}${Date.now()}`
-    }
-}
-
-class Filemoon implements Match {
-    name = 'Filemoon'
-    id = 'filemoon'
-    reliability = Reliability.HIGH
-    domains = [
-        'filemoon.sx',
-        'filemoon.in'
-    ]
-    regex = new RegExp(/eval\(function\(p,a,c,k,e,d\).*?(?=\<\/script\>)/gms)
-
-    async match(match: RegExpMatchArray): Promise<string> {
-        let unpacked = await unPack(match[0])
-        let url = unpacked.match(/(?<=file:").*(?=")/)[0]
-        return url
-    }
-}
-
-class Mixdrop implements Match {
-    name = 'Mixdrop'
-    id = 'mixdrop'
-    reliability = Reliability.HIGH
-    domains = [
-        'mixdrop.co',
-        'mixdrop.to',
-        'mixdrop.ch',
-        'mixdrop.bz',
-        'mixdrop.gl'
-    ]
-    regex = new RegExp(/eval\(function\(p,a,c,k,e,d\).*?(?=\<\/script\>)/gms)
-
-    async match(match: RegExpMatchArray): Promise<string> {
-        let unpacked = await unPack(match[0])
-        let url = unpacked.match(/(?<=MDCore.wurl=").*(?=")/)[0]
-        return `https:${url}`
-    }
-}
-
-class Mp4Upload implements Match {
-    name = 'Mp4Upload'
-    id = 'mp4upload'
-    reliability = Reliability.HIGH
-    domains = [
-        'mp4upload.com'
-    ]
-    replace = true
-    regex = new RegExp(/eval\(function\(p,a,c,k,e,d\).*?(?=\<\/script\>)/gms)
-
-    async match(match: RegExpMatchArray): Promise<string> {
-        let unpacked = await unPack(match[0])
-        let url = unpacked.match(/(?<=player.src\(").*(?=")/)[0]
-        return url
-    }
-}
-
-class Newgrounds implements Match {
-    name = 'Newgrounds'
-    id = 'newgrounds'
-    reliability = Reliability.HIGH
-    domains = [
-        'newgrounds.com'
-    ]
-    regex = new RegExp(/.*/gm)
-
-    async match(match: RegExpMatchArray): Promise<string> {
-        let id = window.location.pathname.split('/').slice(-1)[0]
-        let response = await fetch(`https://www.newgrounds.com/portal/video/${id}`, {
-            headers: {
-                'X-Requested-With': 'XMLHttpRequest'
-            }
-        })
-        let json = await response.json()
-        return decodeURI(json['sources'][Object.keys(json['sources'])[0]][0]['src'])
-    }
-}
-
-class Streamtape implements Match {
-    name = 'Streamtape'
-    id = 'streamtape'
-    reliability = Reliability.NORMAL
-    domains = [
-        'streamtape.com'
-    ]
-    regex = new RegExp(/id=.*(?=')/gm)
-
-    async match(match: RegExpMatchArray): Promise<string> {
-        return `https://streamtape.com/get_video?${match.reverse()[0]}`
-    }
-}
-
-class Streamzz implements Match {
-    name = 'Streamzz'
-    id = 'streamzz'
-    reliability = Reliability.LOW
-    domains = [
-        'streamzz.to',
-        'streamz.ws'
-    ]
-    regex = new RegExp(/(?<=\|)\w{2,}/gm)
-
-    async match(match: RegExpMatchArray): Promise<string> {
-        return `https://get.${document.domain.split('.')[0]}.tw/getlink-${match.sort((a, b) => b.length - a.length)[0]}.dll`
-    }
-}
-
-class Upstream implements Match {
-    name = 'Upstream'
-    id = 'upstream'
-    reliability = Reliability.HIGH
-    domains = [
-        'upstream.to'
-    ]
-    regex = new RegExp(/eval\(function\(p,a,c,k,e,d\).*?(?=\<\/script\>)/gms)
-
-    async match(match: RegExpMatchArray): Promise<string> {
-        let unpacked = await unPack(match[0])
-        let url = unpacked.match(/(?<=file:").*(?=")/)[0]
-        return url
-    }
-}
-
-class Vidoza implements Match {
-    name = 'Vidoza'
-    id = 'vidoza'
-    reliability = Reliability.HIGH
-    domains = [
-        'vidoza.net'
-    ]
-    regex = new RegExp(/(?<=src:\s?").+?(?=")/gm)
-
-    async match(match: RegExpMatchArray): Promise<string> {
-        return match[0]
-    }
-}
-
-class Voe implements Match {
-    name = 'Voe'
-    id = 'voe'
-    reliability = Reliability.HIGH
-    domains = [
-        'voe.sx'
-    ]
-    regex = new RegExp(/https?:\/\/\S*m3u8.+(?=')/gm)
-
-    async match(match: RegExpMatchArray): Promise<string> {
-        return match[0]
-    }
-}
-
-class Vupload implements Match {
-    name = 'Vupload'
-    id = 'vupload'
-    reliability = Reliability.HIGH
-    domains = [
-        'vupload.com'
-    ]
-    regex = new RegExp(/(?<=src:\s?").+?(?=")/gm)
-
-    async match(match: RegExpMatchArray): Promise<string> {
-        return match[0]
-    }
-}
-
-class Kwik implements Match {
-    name = 'Kwik'
-    id = 'kwik'
-    reliability = Reliability.HIGH
-    domains = [
-        'kwik.cx'
-    ]
-    regex = new RegExp(/eval\(function\(p,a,c,k,e,d\).*?(?=\<\/script\>)/gms)
-
-    async match(match: RegExpMatchArray): Promise<string> {
-        console.log(match[0]);
-        let unpacked = await unPack(match[0])
-        let url = unpacked.match(/(?<=source=').*(?=')/)[0]
-        return url
-    }
-}
-
-class DropLoad implements Match {
-    name = 'Dropload'
-    id = 'dropload'
-    reliability = Reliability.HIGH
-    domains = [
-        'dropload.io'
-    ]
-    regex = new RegExp(/eval\(function\(p,a,c,k,e,d\).*?(?=\<\/script\>)/gms)
-
-    async match(match: RegExpMatchArray): Promise<string> {
-        let unpacked = await unPack(match[0])
-        let url = unpacked.match(/(?<=file:").*(?=")/)[0]
-        return url
-    }
-}
-
-class SuperVideo implements Match {
-    name = 'Supervideo'
-    id = 'supervideo'
-    reliability = Reliability.HIGH
-    domains = [
-        'supervideo.tv'
-    ]
-    regex = new RegExp(/eval\(function\(p,a,c,k,e,d\).*?(?=\<\/script\>)/gms)
-
-    async match(match: RegExpMatchArray): Promise<string> {
-        let unpacked = await unPack(match[0])
-        let url = unpacked.match(/(?<=file:").*(?=")/)[0]
-        return url
-    }
-}
-
-class GoodStream implements Match {
-    name = 'Goodstream'
-    id = 'goodstream'
-    reliability = Reliability.NORMAL
-    domains = [
-        'goodstream.uno'
-    ]
-    regex = new RegExp(/(?<=file:\s+").*(?=")/g)
-
-    async match(match: RegExpMatchArray): Promise<string> {
-        return match[0]
-    }
-}
-
-export const matches = [
-    new Doodstream(),
-    new Filemoon(),
-    new Mixdrop(),
-    new Mp4Upload(),
-    new Newgrounds(),
-    new Streamtape(),
-    new Streamzz(),
-    new Upstream(),
-    new Vidoza(),
-    new Voe(),
-    new Vupload(),
-    new Kwik(),
-    new DropLoad(),
-    new SuperVideo(),
-    new GoodStream()
-]
--- a/src/match/unpack.ts
+++ b/src/match/unpack.ts
@ -1,84 +0,0 @@
-function runInPageContext(to_execute: string) {
-    // Adapted from: https://github.com/arikw/extension-page-context
-    const doc = document;
-
-    // test that we are running with the allow-scripts permission
-    try { window.sessionStorage; } catch (ignore) { return null; }
-    
-    // returned value container
-    const resultMessageId = parseInt('' + Math.floor((Math.random() * 100) + 1) + ((new Date()).getTime()));
-    
-    // prepare script container
-    let scriptElm = doc.createElement('script');
-    scriptElm.setAttribute("type", "application/javascript");
-
-    const code = `
-        (
-            async function () {
-
-                    const response = {
-                        id: ${resultMessageId}
-                    };
-
-                    try {
-                        response.result = JSON.stringify(await (${to_execute})() ); // run script
-                    } catch(err) {
-                        response.error = JSON.stringify(err);
-                    }
-            
-                    window.postMessage(response, '*');
-            }
-        )();
-    `;
-
-    // inject the script
-    scriptElm.textContent = code;
-
-    // run the script
-    doc.documentElement.appendChild(scriptElm);
-
-    // clean up script element
-    scriptElm.remove();
-
-    // create a "flat" promise
-    let resolve, reject;
-    const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
-
-
-    // resolve on result
-    function onResult(event) {
-        const data = Object(event.data);
-        if (data.id === resultMessageId) {
-            window.removeEventListener('message', onResult);
-            if (data.error !== undefined) {
-                return reject(JSON.parse(data.error));
-            }
-            return resolve((data.result !== undefined) ? JSON.parse(data.result) : undefined);
-        }
-    }
-
-    window.addEventListener('message', onResult);
-
-	return promise;
-}
-
-export const unPack = async (packed: String): Promise<string> => {
-    // Adapted from http://matthewfl.com/unPacker.html by matthew@matthewfl.com
-	
-	let context = `
-		{
-			eval: function (c) {
-				packed = c;
-			},
-			window: {},
-			document: {}
-		}
-	`
-	
-	const to_execute = `function() { let packed = ""; with(${context}) { ` + packed + '}; return packed; }'
-
-	const res = await runInPageContext(to_execute);
-
-
-	return (res+"").replace(/;/g, ";\n").replace(/{/g, "\n{\n").replace(/}/g, "\n}\n").replace(/\n;\n/g, ";\n").replace(/\n\\n/g, "\n");
-}
--- a/src/store/settings.ts
+++ b/src/store/settings.ts
@ -1,27 +0,0 @@
-import { storageSet, storageGet } from "./store"
-
-export class Setting {
-    name: string
-    info_url?: string
-
-    constructor(name: string, info_url?: string) {
-        this.name = name
-        this.info_url = info_url
-    }
-
-    async enable() {
-        await storageSet(this.name, true)
-    }
-
-    async disable() {
-        await storageSet(this.name, false)
-    }
-
-    async get_status() {
-        return await storageGet(this.name)
-    }
-}
-
-export const Settings = [
-    new Setting("ff2mpv", "https://github.com/ByteDream/stream-bypass/tree/master#ff2mpv-use-mpv-to-directly-play-streams")
-]
--- a/src/store/store.ts
+++ b/src/store/store.ts
@ -1,70 +0,0 @@
-import {Match, matches} from "../match/matches";
-
-export async function storageGet(key: string): Promise<any> {
-    return new Promise((resolve) => {
-        chrome.storage.local.get(key, (value) => {
-            resolve(value[key])
-        })
-    })
-}
-
-export async function storageSet(key: string, value: any) {
-    const obj = {}
-    obj[key] = value
-    await chrome.storage.local.set(obj)
-}
-
-export async function storageDelete(key: string) {
-    await chrome.storage.local.remove(key)
-}
-
-export async function getDisabled(): Promise<Match[]> {
-    const localMatches = []
-
-    for (const disabled of (await storageGet('disabled') as string[]) || []) {
-        let m: Match
-        if ((m = matches.find((v) => v.id === disabled)) !== undefined) {
-            localMatches.push(m)
-        }
-    }
-
-    return localMatches
-}
-
-export async function getAllDisabled(): Promise<boolean> {
-    const value = await storageGet('all')
-    return value !== undefined ? String(value).toLowerCase() === 'true' : false
-}
-
-export async function enableAll() {
-    await storageSet('all', false)
-    await chrome.browserAction.setIcon({
-        path: null
-    })
-}
-
-export async function disableAll() {
-    await storageSet('all', true)
-    await chrome.browserAction.setIcon({
-        path: {
-            48: chrome.runtime.getURL('icons/disabled_48.png'),
-            128: chrome.runtime.getURL('icons/disabled_128.png')
-        }
-    })
-}
-
-export async function enable(match: Match) {
-    const disabled = await storageGet('disabled') || []
-    disabled.splice(disabled.indexOf(match.id))
-    await storageSet('disabled', disabled)
-}
-
-export async function disable(match: Match) {
-    const disabled = await storageGet('disabled') as string[] || []
-    if (disabled.indexOf(match.id) !== undefined) {
-        disabled.push(match.id)
-        await storageSet('disabled', disabled)
-    }
-}
-
-export const getSetting = storageGet
--- a/src/tsconfig.json
+++ b/src/tsconfig.json
@ -1,18 +0,0 @@
-{
-  "compilerOptions": {
-    "module": "esnext",
-    "target": "es2019",
-    "removeComments": true,
-    "esModuleInterop": true,
-    "lib": [
-      "dom",
-      "es5",
-      "scripthost",
-      "es2015.collection",
-      "es2015.promise"
-    ],
-  },
-  "exclude": [
-    "../node_modules"
-  ]
-}
--- a/src/ui/player/player.html
+++ b/src/ui/player/player.html
@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Stream Bypass</title>
-    <link rel="stylesheet" href="player.css">
-    <script src="player.js" defer></script>
-</head>
-<body>
-<video id="video"></video>
-<div id="message-container">
-    <p id="message"></p>
-    <br>
-    <p>Open a new issue <a href="https://github.com/ByteDream/stream-bypass/issues">here</a></p>
-</div>
-</body>
-</html>
--- a/src/ui/player/player.scss
+++ b/src/ui/player/player.scss
@ -1,34 +0,0 @@
-body {
-  background-color: #131313;
-}
-
-html, body, video {
-  width: 100%;
-  height: 100%;
-  margin: 0;
-}
-
-video {
-  position: absolute;
-  top: 0;
-  left: 0;
-}
-
-#message-container {
-  visibility: hidden;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  flex-direction: column;
-  color: white;
-  text-align: center;
-  height: 100%;
-
-  & * {
-    visibility: inherit;
-  }
-
-  & a, & a:visited {
-    color: red
-  }
-}
--- a/src/ui/player/player.ts
+++ b/src/ui/player/player.ts
@ -1,50 +0,0 @@
-import {matches} from "../../match/matches";
-// @ts-ignore
-import Hls from "hls.js";
-
-function show_message(message: string) {
-    document.getElementById('message').innerText = message
-    document.getElementById('message-container').style.visibility = 'visible'
-    document.getElementById('video').hidden = true
-}
-
-async function play_native(url: string) {
-    const video = document.getElementById('video') as HTMLVideoElement
-    video.controls = true
-    video.src = url
-}
-
-async function play_hls(url: string) {
-    const video = document.getElementById('video') as HTMLVideoElement
-    video.controls = true
-
-    if (video.canPlayType('application/vnd.apple.mpegurl')) {
-        video.src = url
-    } else if (Hls.isSupported()) {
-        const hls = new Hls({
-            enableWorker: false
-        })
-        hls.loadSource(url)
-        hls.attachMedia(video)
-    } else {
-        show_message('Failed to play m3u8 video (hls is not supported). Try again or create a new issue <a href="https://github.com/ByteDream/stream-bypass/issues/new">here</a>')
-    }
-}
-
-async function main() {
-    const urlQuery = new URLSearchParams(window.location.search)
-    const id = urlQuery.get('id')
-    const url = decodeURIComponent(urlQuery.get('url'))
-    const domain = urlQuery.get('domain')
-
-    const match = matches.find((m) => m.id === id)
-    if (match === undefined) {
-        show_message(`Invalid id: ${id}. Please report this <a href="https://github.com/ByteDream/stream-bypass/issues">here</a>`)
-        return
-    }
-    document.title = `Stream Bypass (${domain})`
-
-    new URL(url).pathname.endsWith('.m3u8') ? await play_hls(url) : await play_native(url)
-}
-
-main()
--- a/src/ui/popup/popup.html
+++ b/src/ui/popup/popup.html
@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Stream-Bypass</title>
-    <link rel="stylesheet" href="popup.css">
-    <script src="popup.js" defer></script>
-</head>
-<body>
-<div id="container">
-    <div id="all">
-        <div class="buttons">
-            <a>On</a>
-            <a>Off</a>
-        </div>
-        <p>Hosters</p>
-        <table id="sub-container">
-        </table>
-        <hr class="upper-hr">
-        <p>Settings</p>
-        <table id="settings-container">
-        </table>
-    </div>
-    <hr>
-
-    <table id="sub-container">
-    </table>
-    <a id="error" href="https://github.com/ByteDream/stream-bypass/issues">Something does not work</a>
-</div>
-</body>
-</html>
--- a/src/ui/popup/popup.scss
+++ b/src/ui/popup/popup.scss
@ -1,76 +0,0 @@
-body {
-  background-color: #2b2a33;
-  font-weight: bold;
-  max-height: 500px;
-  overflow-x: hidden;
-  overflow-y: auto;
-}
-
-a, p {
-  color: white;
-  font-size: 16px;
-  margin: 5px 0;
-  cursor: default;
-}
-
-a {
-  border: 1px solid #281515;
-  cursor: pointer;
-  font-weight: normal;
-  padding: 5px 8px;
-
-  &.active {
-    background-color: rgba(255, 65, 65, 0.74);
-    cursor: default;
-  }
-
-  &.disabled {
-    background-color: grey;
-    cursor: not-allowed;
-  }
-
-  &#error {
-    border: none;
-    display: block;
-    font-weight: lighter;
-    font-size: 0.8rem;
-    text-align: center;
-    padding: 10px 0 5px 0;
-  }
-
-}
-
-
-hr {
-  margin: 3px 0;
-
-  &.upper-hr {
-    width: 100%;
-  }
-}
-
-#all {
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-  margin: 10px 0
-}
-
-.buttons {
-  margin-bottom: 10px;
-}
-
-.low-reliability {
-  text-decoration: underline;
-  text-decoration-color: rgb(255, 0, 0);
-}
-
-.normal-reliability {
-  text-decoration: underline;
-  text-decoration-color: yellow;
-}
-
-.high-reliability {
-  text-decoration: underline;
-  text-decoration-color: #00ff00;
-}
--- a/src/ui/popup/popup.ts
+++ b/src/ui/popup/popup.ts
@ -1,142 +0,0 @@
-import {getDisabled, disable, enable, getAllDisabled, enableAll, disableAll} from "../../store/store";
-import {matches, Reliability} from "../../match/matches";
-import { Settings, Setting } from "../../store/settings";
-
-async function main() {
-    const disabled = await getDisabled()
-
-    const subContainer = document.getElementById('sub-container')
-    for (const m of matches) {
-        const row = document.createElement('tr')
-
-        const name = document.createElement('td')
-        const nameValue = document.createElement('p')
-        nameValue.innerText = m.name
-        switch (m.reliability) {
-            case Reliability.LOW:
-                nameValue.classList.add('low-reliability')
-                break
-            case Reliability.NORMAL:
-                nameValue.classList.add('normal-reliability')
-                break
-            case Reliability.HIGH:
-                nameValue.classList.add('high-reliability')
-                break
-        }
-
-        const buttons = document.createElement('td')
-        buttons.classList.add('buttons')
-        const on = document.createElement('a')
-        on.innerText = 'On'
-        const off = document.createElement('a')
-        off.innerText = 'Off'
-        disabled.find((v) => v.id === m.id) === undefined ? on.classList.add('active') : off.classList.add('active')
-
-        on.onclick = async function () {
-            if (!on.classList.contains('disabled')) {
-                await enable(m)
-                on.classList.add('active')
-                off.classList.remove('active')
-            }
-        }
-        off.onclick = async function () {
-            if (!off.classList.contains('disabled')) {
-                await disable(m)
-                on.classList.remove('active')
-                off.classList.add('active')
-            }
-        }
-
-        name.append(nameValue)
-        buttons.append(on, off)
-        row.append(name, buttons)
-        subContainer.append(row)
-    }
-
-    const settingsContainer = document.getElementById("settings-container") 
-    for (const s of Settings) {
-        const row = document.createElement('tr')
-
-        const name = document.createElement('td')
-        const nameValue = document.createElement('p')
-        nameValue.innerText = s.name
-
-        const buttons = document.createElement('td')
-        buttons.classList.add('buttons')
-        const on = document.createElement('a')
-        on.innerText = 'On'
-        const off = document.createElement('a')
-        off.innerText = 'Off'
-        const info = document.createElement('a')
-        info.target = "_blank"
-        info.href = s.info_url
-        info.innerText = "🛈"
-
-        await s.get_status() ? on.classList.add('active') : off.classList.add('active')
-
-        on.onclick = async function () {
-            if (!on.classList.contains('disabled')) {
-                await s.enable()
-                on.classList.add('active')
-                off.classList.remove('active')
-            }
-        }
-        off.onclick = async function () {
-            if (!off.classList.contains('disabled')) {
-                await s.disable()
-                on.classList.remove('active')
-                off.classList.add('active')
-            }
-        }
-
-        name.append(nameValue)
-        buttons.append(on, off)
-        if (s.info_url) {
-            buttons.append(info)
-        }
-        row.append(name, buttons)
-        settingsContainer.append(row)
-    }
-
-    const allOnButton = document.getElementById('all').getElementsByTagName('a')[0]
-    const allOffButton = document.getElementById('all').getElementsByTagName('a')[1]
-
-    if (await getAllDisabled()) {
-        const allBtns = document.getElementById('sub-container').getElementsByTagName('a')
-        for (let i = 0; i < allBtns.length; i++) {
-            allBtns[i].classList.add('disabled')
-        }
-        allOffButton.classList.add('active')
-    } else {
-        allOnButton.classList.add('active')
-    }
-
-    allOnButton.onclick = async () => {
-        if (!allOnButton.classList.contains('active')) {
-            allOnButton.classList.add('active')
-            allOffButton.classList.remove('active')
-
-            const allBtns = document.getElementById('sub-container').getElementsByTagName('a')
-            for (let i = 0; i < allBtns.length; i++) {
-                allBtns[i].classList.remove('disabled')
-            }
-
-            await enableAll()
-        }
-    }
-    allOffButton.onclick = async () => {
-        if (!allOffButton.classList.contains('active')) {
-            allOffButton.classList.add('active')
-            allOnButton.classList.remove('active')
-
-            const allBtns = document.getElementById('sub-container').getElementsByTagName('a')
-            for (let i = 0; i < allBtns.length; i++) {
-                allBtns[i].classList.add('disabled')
-            }
-
-            await disableAll()
-        }
-    }
-}
-
-main()
--- a/src/vite-env.d.ts
+++ b/src/vite-env.d.ts
@ -0,0 +1,3 @@
+/// <reference types="svelte" />
+/// <reference types="vite/client" />
+/// <reference types="@samrum/vite-plugin-web-extension/client" />
--- a/svelte.config.js
+++ b/svelte.config.js
@ -0,0 +1,7 @@
+import sveltePreprocess from 'svelte-preprocess';
+
+export default {
+	// Consult https://github.com/sveltejs/svelte-preprocess
+	// for more information about preprocessors
+	preprocess: sveltePreprocess()
+};
--- a/tasks/build.ts
+++ b/tasks/build.ts
@ -1,103 +0,0 @@
-const fs = require('fs')
-const path = require('path')
-const rollup = require('rollup')
-const rollupPluginCommonJs = require('@rollup/plugin-commonjs')
-const rollupPluginNodeResolve = require('@rollup/plugin-node-resolve').default
-const rollupPluginReplace = require('@rollup/plugin-replace')
-const rollupPluginTypescript = require('@rollup/plugin-typescript')
-const sass = require('sass')
-const typescript = require('typescript')
-
-async function buildManifest() {
-    const manifest = JSON.parse(fs.readFileSync('src/manifest.json'))
-
-    manifest['version'] = process.env.npm_package_version
-
-    fs.writeFileSync('src/manifest.json', JSON.stringify(manifest, null, 2))
-}
-
-async function buildMisc() {
-    const files = {
-        'src/manifest.json': 'build/manifest.json',
-
-        'src/icons/logo_48.png': 'build/icons/logo_48.png',
-        'src/icons/logo_128.png': 'build/icons/logo_128.png',
-        'src/icons/disabled_48.png': 'build/icons/disabled_48.png',
-        'src/icons/disabled_128.png': 'build/icons/disabled_128.png',
-    }
-
-    for (const [src, dst] of Object.entries(files)) {
-        fs.mkdirSync(path.dirname(dst), {recursive: true})
-        fs.copyFileSync(src, dst)
-    }
-}
-
-async function buildHtml() {
-    const files = {
-        'src/ui/popup/popup.html': 'build/ui/popup/popup.html',
-        'src/ui/player/player.html': 'build/ui/player/player.html'
-    }
-
-    for (const [src, dst] of Object.entries(files)) {
-        fs.mkdirSync(path.dirname(dst), {recursive: true})
-        fs.copyFileSync(src, dst)
-    }
-}
-
-async function buildCss() {
-    const files = {
-        'src/ui/popup/popup.scss': 'build/ui/popup/popup.css',
-        'src/ui/player/player.scss': 'build/ui/player/player.css'
-    }
-
-    for (const [src, dst] of Object.entries(files)) {
-        const compiled = await sass.compileAsync(src)
-        fs.mkdirSync(path.dirname(dst), {recursive: true})
-        fs.writeFileSync(dst, compiled.css)
-    }
-}
-
-async function buildJs() {
-    const files = {
-        'src/ui/popup/popup.ts': 'build/ui/popup/popup.js',
-        'src/ui/player/player.ts': 'build/ui/player/player.js',
-
-        'src/index.ts': 'build/index.js',
-        'src/background.ts': 'build/background.js'
-    }
-
-    for (const [src, dst] of Object.entries(files)) {
-        const bundle = await rollup.rollup({
-            input: src,
-            plugins: [
-                rollupPluginNodeResolve({
-                    browser: true
-                }),
-                rollupPluginReplace({
-                    'process.env.NODE_ENV': JSON.stringify('production')
-                }),
-                rollupPluginTypescript({
-                    typescript,
-                    tsconfig: 'src/tsconfig.json'
-                }),
-                rollupPluginCommonJs({
-                    extensions: ['.js', '.ts']
-                })
-            ]
-        })
-        await bundle.write({
-            file: dst,
-            strict: true
-        })
-    }
-}
-
-async function build() {
-    await buildManifest()
-    await buildMisc()
-    await buildHtml()
-    await buildCss()
-    await buildJs()
-}
-
-build()
--- a/tsconfig.json
+++ b/tsconfig.json
@ -0,0 +1,18 @@
+{
+	"extends": "@tsconfig/svelte/tsconfig.json",
+	"compilerOptions": {
+		"allowSyntheticDefaultImports": true,
+		"target": "es2021",
+		"module": "esnext",
+		"useDefineForClassFields": true,
+		"resolveJsonModule": true,
+		"removeComments": true,
+		"baseUrl": ".",
+		"paths": {
+			"~/*": ["src/*"]
+		},
+		"allowJs": true,
+		"checkJs": true
+	},
+	"include": ["src/**/*.d.ts", "src/**/*.ts", "src/**/*.js", "src/**/*.svelte"]
+}
--- a/vite.config.ts
+++ b/vite.config.ts
@ -0,0 +1,36 @@
+import { fileURLToPath } from 'url';
+import webExtension from '@samrum/vite-plugin-web-extension';
+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/
+export default defineConfig(({ mode }) => {
+	const env = loadEnv(mode, process.cwd(), '');
+
+	return {
+		plugins: [
+			svelte() as PluginOption,
+			webExtension({
+				manifest: getManifest(Number(env.MANIFEST_VERSION)),
+				additionalInputs: {
+					html: [
+						{
+							fileName: 'src/entries/player/player.html',
+							webAccessible: {
+								matches:
+									Number(env.MANIFEST_VERSION) === 3
+										? Object.values(matches).flatMap((m) => m.domains.map((d) => `*://${d}/*`))
+										: ['<all_urls>']
+							}
+						}
+					]
+				}
+			}) as unknown as PluginOption
+		],
+		resolve: {
+			alias: [{ find: '~', replacement: fileURLToPath(new URL('./src', import.meta.url)) }]
+		}
+	};
+});
Author	SHA1	Message	Date
bytedream	607326e6d6	Update dependencies and version	2025-05-08 02:02:57 +02:00
bytedream	47f6de2de8	Fix voe	2025-05-08 01:59:29 +02:00
bytedream	d159fb0aa4	Add mixdrop domain	2025-05-06 22:21:09 +02:00
bytedream	290733a85a	Add supervideo domain	2025-05-06 22:20:04 +02:00
bytedream	84eb32ab61	Fix dropload domain	2025-05-06 22:18:19 +02:00
bytedream	927a4e3ae3	Update dependencies and version	2025-04-17 02:43:13 +02:00
bytedream	5926177920	Update voe.sx match regex	2025-04-17 02:37:32 +02:00
bytedream	9a29316641	Fix voe.sx	2025-04-17 02:26:59 +02:00
bytedream	c300125f64	Set javascript target to es2021	2025-04-17 02:26:41 +02:00
bytedream	59f2ffec57	Allow arbitrary properties in Match interface	2025-04-17 02:10:18 +02:00
bytedream	6dff691c25	Use other notation for match function	2025-04-17 02:04:45 +02:00
bytedream	c4085f9ac8	Update version	2025-04-04 02:13:20 +02:00
bytedream	422702b16f	Add import order prettier plugin	2025-04-04 02:10:51 +02:00
bytedream	c3dad3681c	Fix player media type url query	2025-04-04 02:05:04 +02:00
bytedream	6eb3259ec5	Remove duplicate supported websites	2025-04-04 01:11:41 +02:00
bytedream	68e445a738	Update supported websites	2025-04-04 00:58:14 +02:00
bytedream	e864bc6100	Update dependencies and version	2025-04-04 00:45:03 +02:00
bytedream	3ac73ac3b4	Update vite config	2025-04-04 00:44:51 +02:00
bytedream	6aaf960c28	Holy fuck why does vite have a problem with this	2025-04-04 00:43:57 +02:00
bytedream	8a13dea681	Format	2025-04-04 00:01:21 +02:00
bytedream	8d575241fe	Fix lastPathSegment util	2025-04-04 00:00:38 +02:00
bytedream	50f400b8b9	Use enum to specify media type	2025-04-03 23:56:18 +02:00
bytedream	f6fcfd354a	Add more utils	2025-04-03 23:48:53 +02:00
bytedream	c081127d35	Add loadx.ws	2025-04-03 23:43:49 +02:00
bytedream	416fceba88	Update match function to manually specify media type	2025-04-03 23:43:39 +02:00
bytedream	a9cf03c176	Fix luluvdo.com	2025-04-03 23:14:31 +02:00
bytedream	8852318483	Update voe.sx to catch every redirect url	2025-04-03 22:55:24 +02:00
bytedream	7067aaf4a0	Add luluvdo.com to supported websites table	2025-03-14 18:52:08 +01:00
bytedream	bf723e2ed6	Update dependencies and version	2025-03-14 18:41:05 +01:00
bytedream	9c80362a1c	Update ci actions	2025-03-14 18:31:29 +01:00
bytedream	ae738ff32f	Add luluvdo.com site	2025-03-14 18:20:08 +01:00
bytedream	16d4f2956a	Add dood.work domain (#23 )	2025-03-14 17:43:50 +01:00
bytedream	f6c6102436	Merge pull request #24 from muleyo/main Added Voe.sx Domain	2025-03-13 16:08:39 +01:00
muleyo	f1525817b1	Added Voe.sx Domain A domain for Voe.sx was missing	2025-03-10 01:42:23 +01:00
bytedream	1e1d8cdfa6	Fix tick character	2024-12-19 22:50:59 +01:00
bytedream	47eed2d12b	Update supported websites	2024-12-15 19:08:50 +01:00
bytedream	67e03eafaa	Update dependencies and version	2024-12-15 18:43:06 +01:00
bytedream	db0ccd9b56	Fix vidoza.net	2024-12-15 18:05:25 +01:00
bytedream	fd3eda9c61	Fix vidmoly.to	2024-12-15 17:31:13 +01:00
bytedream	e522916585	Fix filemoon.to	2024-12-15 17:14:46 +01:00
bytedream	b9514284da	Fix voe.sx	2024-12-15 16:16:38 +01:00
bytedream	06beaa6ebe	Update README	2024-07-29 02:35:43 +02:00
bytedream	6a56c37dd2	Update package-lock.json	2024-07-29 02:31:30 +02:00
bytedream	018b381732	Update README	2024-07-29 00:00:57 +02:00
bytedream	696ec22471	Update dependencies and version	2024-07-28 23:43:56 +02:00
bytedream	e379113aa4	Add firefox android support	2024-07-28 23:33:54 +02:00
bytedream	84605ceb30	Make nativeMessaging an optional permission	2024-07-28 23:31:25 +02:00
bytedream	67c492db47	Update popup UI	2024-07-28 23:04:04 +02:00
bytedream	ae2f196b06	Lint	2024-07-28 18:08:05 +02:00
bytedream	298e9308ce	Add streama2z.com (#19 )	2024-07-28 17:54:41 +02:00
bytedream	3cd4c6b6b7	Fix doodstream.com	2024-07-28 17:54:02 +02:00
bytedream	6286acf85c	Make video replace strategy more aggressive	2024-07-28 17:33:54 +02:00
bytedream	94eee79218	Fix voe.sx	2024-07-28 16:35:58 +02:00
bytedream	2f186bda07	Add d000d.com (#18 )	2024-07-28 14:46:36 +02:00
bytedream	1c9f95cebc	Fix linting errors	2024-07-14 21:08:47 +02:00
bytedream	c57cd03407	Fix vidmoly & add it to README	2024-05-20 15:40:38 +02:00
bytedream	64cf565da3	Update dependencies and version	2024-05-20 15:37:46 +02:00
bytedream	bf8a7eb602	Remove reliability	2024-05-20 14:11:09 +02:00
bytedream	c643a39e2d	Add new doodstream domain	2024-04-24 01:18:01 +02:00
bytedream	fcfbc41fdb	Fix voe.sx	2024-04-24 00:46:32 +02:00
bytedream	1251f079f5	Remove discord link	2023-12-10 19:51:35 +01:00
bytedream	ccfc77167b	Add vidmoly.me	2023-12-08 15:50:19 +01:00
bytedream	a10066458f	Add chrome web store link	2023-11-20 12:20:32 +01:00
bytedream	6a8c705b06	Fix mv2 chrome namespace apis	2023-11-17 16:25:40 +01:00
bytedream	76a5bac7fd	Fix chromium popup height	2023-11-17 16:25:29 +01:00
bytedream	3aca863a4b	Fix invalid release name	2023-11-17 15:06:17 +01:00
bytedream	fe14edc0ef	Make mv3 compatible	2023-11-17 15:06:09 +01:00
bytedream	fffe23638c	Update build instructions	2023-11-11 22:05:39 +01:00
bytedream	5214228a72	Add linting and build pipeline	2023-11-11 21:48:53 +01:00
bytedream	7000d5a08b	Lint	2023-11-11 21:48:44 +01:00
bytedream	a21f799e7d	Update install instructions	2023-11-11 21:35:24 +01:00
bytedream	1fb85313dd	Use more reliable streamtape match function	2023-11-11 21:31:23 +01:00
bytedream	6e7410b088	Rewrite	2023-11-11 21:31:20 +01:00
Bharathi	0054f5da0e	Update few domains (#15 ) * Update matches.ts * Update matches.ts * Update matches.ts	2023-08-08 18:58:50 +02:00
				`@ -0,0 +1 @@`
				<svg xmlns="http://www.w3.org/2000/svg" width="738.248" height="738.248" viewBox="0 0 195.328 195.328"><path d="M108.902 30.525c-53.858 0-97.664 43.806-97.664 97.664 0 53.86 43.806 97.665 97.664 97.665 53.86 0 97.664-43.806 97.664-97.665 0-53.858-43.805-97.664-97.664-97.664zm0 13.434c46.6 0 84.23 37.632 84.23 84.23 0 46.6-37.63 84.23-84.23 84.23-46.599 0-84.232-37.63-84.232-84.23 0-46.598 37.633-84.23 84.232-84.23z" style="color:#000;fill:#000;-inkscape-stroke:none" transform="translate(-11.238 -30.525)"/><path d="M8.986 105.297v96.926l83.94-48.463-7.7-4.446zm10.266 17.781 53.143 30.682-53.143 30.681z" style="color:#000;fill:#000;-inkscape-stroke:none" transform="matrix(1.30853 0 0 1.30853 44.795 -103.534)"/><path d="M345.131 686.085c-122.49-10.29-225.617-86.136-271.115-199.397-9.596-23.888-15.72-47.197-20.05-76.315-2.763-18.58-2.76-64.116.004-82.784 7.5-50.64 23.648-93.74 49.956-133.33 39.979-60.166 96.484-103.56 164.472-126.311 53.98-18.063 110.354-21.415 165.476-9.838 82.83 17.396 153.434 65.363 200.69 136.344 10.702 16.073 25.836 46.006 32.68 64.634 6.703 18.242 13.106 43.275 16.28 63.647 2.098 13.461 2.487 20.483 2.534 45.734.06 31.25-.585 38.592-5.576 63.53-26.78 133.796-136.647 235.614-272.394 252.435-17.246 2.137-47.675 2.935-62.957 1.651zm77.476-197.054c113.33-65.435 206.175-119.33 206.322-119.767.277-.827-411.864-239.171-414.659-239.8-1.374-.31-1.586 31.672-1.586 239.605 0 227.996.097 239.938 1.934 239.45 1.063-.283 94.658-54.052 207.989-119.487z" style="fill:#fff;stroke:#000;stroke-width:5.46616" transform="scale(.26458)"/></svg>