Version to 2.1.0

README.md

@@ -27,7 +27,7 @@ A multi-browser addon / extension for multiple streaming providers which redirec
   •
   <a href="#-supported-sites">Supported Sites 📜</a>
   •
-  <a href="#%EF%B8%8F-compiling">Compiling ⚙️</a>
+  <a href="#%EF%B8%8F-building">Building ⚙️</a>
   •
   <a href="#-license">License ⚖</a>
 </p>
@@ -67,22 +67,22 @@ Install the addon directly from the [firefox addon store](https://addons.mozilla
 
 ## 📜 Supported sites
 
-| Site                                                                  | Supported | Note                                             |
-|-----------------------------------------------------------------------|-----------|--------------------------------------------------|
-| [doodstream.com](doodstream.com) / [dood.pm](https://dood.pm)         | ❌         | Reverse engineering the site costs too much time |
-| [evoload.io](https://evoload.io)                                      | ✔️        |                                                  |
-| [mixdrop.co](https://mixdrop.co)                                      | ✔ ️       |                                                  |		
-| [mp4upload.com](https://mp4upload.com)                                | ❌         | URL can be extracted but not played              |
-| [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 |
-| [vidlox.me](https://vidlox.me)                                        | ⚠         | Website down / Timeout                           |
-| [vidoza.net](https://vidoza.net)                                      | ✔         |                                                  |
-| [vivo.sx](https://vivo.sx)                                            | ⚠️        | Website down / Timeout                           |
-| [voe.sx](https://voe.sx) / [voeunblk.com](https://voeunblk.com)       | ✔         |                                                  |
-| [vupload.com](https://vupload.com)                                    | ✔         |                                                  |
+| Site                                                                  | Supported | Note                                                                                                                                                                                     |
+|-----------------------------------------------------------------------|-----------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| [doodstream.com](doodstream.com) / [dood.pm](https://dood.pm)         | ❌         | URL can be extracted but not played (see [here](https://github.com/ByteDream/stream-bypass/blob/674527ed9c1aa35a30fed135c46017571dd3ce31/src/match/matches.ts#L18) for more information) |
+| [evoload.io](https://evoload.io)                                      | ✔️        |                                                                                                                                                                                          |
+| [mixdrop.co](https://mixdrop.co)                                      | ✔ ️       |                                                                                                                                                                                          |		
+| [mp4upload.com](https://mp4upload.com)                                | ❌         | URL can be extracted but not. Probably the same issue as with doodstream                                                                                                                 |
+| [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                                                                                                                                         |
+| [vidlox.me](https://vidlox.me)                                        | ⚠         | Website down / Timeout                                                                                                                                                                   |
+| [vidoza.net](https://vidoza.net)                                      | ✔         |                                                                                                                                                                                          |
+| [vivo.sx](https://vivo.sx)                                            | ⚠️        | Website down / Timeout                                                                                                                                                                   |
+| [voe.sx](https://voe.sx) / [voeunblk.com](https://voeunblk.com)       | ✔         |                                                                                                                                                                                          |
+| [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.
@@ -90,9 +90,9 @@ Install the addon directly from the [firefox addon store](https://addons.mozilla
 
 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.
 
-## ⚙️ Compiling
+## ⚙️ Building
 
-If you want to compile the addon from source and not using the [installation](#installation) way, follow the instructions.
+If you want to build the addon from source and not using the [installation](#installation) way, follow the instructions.
 
 Requirements:
 - `npm` installed.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "stream-bypass",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "Multi-browser addon for multiple streaming providers which redirects directly to the source video",
   "main": "src/index.ts",
   "scripts": {

src/background.ts

@@ -0,0 +1,16 @@
+import {getMatch} from "./match/match";
+import {storageGet, storageSet} from "./store/store";
+import {Match} from "./match/matches";
+
+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)
+        }
+    }
+}, {
+    urls: ['<all_urls>'],
+    types: ['main_frame', 'sub_frame']
+})

src/index.ts

@@ -1,24 +1,26 @@
-import {matches} from "./match/match";
-import {getAllDisabled, getDisabled} from "./store/store";
+import {getMatch} from "./match/match";
+import {storageDelete, storageGet} from "./store/store";
+import {Match, matches} from "./match/matches";
 
 async function main() {
-    if (await getAllDisabled()) {
+    let match: Match;
+    if ((match = await getMatch(window.location.host)) === undefined) {
+        let id: string
+        if ((id = await storageGet('redirect')) !== undefined) {
+            match = matches.find(m => m.id === id)
+            await storageDelete('redirect')
+        } else {
+            return
+        }
+    }
+
+    const re = document.body.innerHTML.match(match.regex)
+    if (re === null) {
         return
     }
 
-    for (const match of matches) {
-        if (!match.domains.some((v) => window.location.host.indexOf(v) !== -1) || ((await getDisabled()).some((v) => v === match))) {
-            continue
-        }
-
-        const re = document.body.innerHTML.match(match.regex)
-        if (re === null) {
-            continue
-        }
-
-        const url = await match.match(re)
-        location.assign(chrome.runtime.getURL(`ui/player/player.html?id=${match.id}&url=${encodeURIComponent(url)}`))
-    }
+    const url = await match.match(re)
+    location.assign(chrome.runtime.getURL(`ui/player/player.html?id=${match.id}&url=${encodeURIComponent(url)}`))
 }
 
 main()

src/manifest.json

@@ -3,7 +3,7 @@
   "name": "Stream Bypass",
   "author": "ByteDream",
   "description": "A multi-browser addon / extension for multiple streaming providers which redirects directly to the source video.",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "homepage_url": "https://github.com/ByteDream/stream-bypass",
   "browser_specific_settings": {
     "gecko": {
@@ -14,19 +14,7 @@
     {
       "all_frames": true,
       "matches": [
-        "*://*.evoload.io/*",
-        "*://*.mixdrop.co/*",
-        "*://*.newgrounds.com/*",
-        "*://*.streamtape.com/*",
-        "*://*.streamzz.to/*",
-        "*://*.streamz.ws/*",
-        "*://*.upstream.to/*",
-        "*://*.vidlox.me/*",
-        "*://*.vidoza.net/*",
-        "*://*.vivo.sx/*",
-        "*://*.voe.sx/*",
-        "*://*.voeunblk.com/*",
-        "*://*.vupload.com/*"
+        "<all_urls>"
       ],
       "js": [
         "index.js"
@@ -34,8 +22,18 @@
       "run_at": "document_end"
     }
   ],
+  "background": {
+    "scripts": [
+      "background.js"
+    ]
+  },
   "permissions": [
-    "storage"
+    "storage",
+    "webRequest",
+    "<all_urls>"
+  ],
+  "web_accessible_resources": [
+    "ui/player/*"
   ],
   "browser_action": {
     "default_icon": {

src/match/match.ts

@@ -1,231 +1,14 @@
-export enum Reliability {
-    HIGH = 1,
-    NORMAL,
-    LOW,
-}
+import {Match, matches} from "./matches";
+import {getAllDisabled, getDisabled} from "../store/store";
 
-export abstract class Match {
-    name: string
-    id: string
-    reliability: Reliability
-    domains: string[]
-    regex: RegExp
-    abstract match(match: RegExpMatchArray): Promise<string>
-
-    notice?: string
-}
-
-class Evoload implements Match {
-    name = 'Evoload'
-    id = 'evoload'
-    reliability = Reliability.NORMAL
-    domains = [
-        'evoload.io'
-    ]
-    regex = new RegExp(/.*/gm)
-
-    async match(match: RegExpMatchArray): Promise<string> {
-        const code = window.location.pathname.split('/').slice(-1)[0]
-        const response = await fetch('https://evoload.io/SecurePlayer', {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json'
-            },
-            body: JSON.stringify({code: code})
-        })
-
-        const json = await response.json()
-        return json['stream']['src']
-    }
-}
-
-class Mixdrop implements Match {
-    name = 'Mixdrop'
-    id = 'mixdrop'
-    reliability = Reliability.HIGH
-    domains = [
-        'mixdrop.co'
-    ]
-    regex = new RegExp(/(?<=\|)\w{2,}/gm)
-
-    async match(match: RegExpMatchArray): Promise<string> {
-        return `https://a-${match[1]}.${match[4]}.${match[5]}/v/${match[2]}.${match[6]}?s=${match[12]}&e=${match[13]}`
-    }
-}
-
-/*class Mp4Upload implements Match {
-    name = 'Mp4Upload'
-    id = 'mp4upload'
-    reliability = Reliability.LOW
-    domains = [
-        'mp4upload.com'
-    ]
-    regex = new RegExp(/(?<=\|)\w{2,}/gm)
-
-    async match(match: RegExpMatchArray): Promise<string> {
-        return `https://${match[34]}.mp4upload.com:${match[89]}/d/${match[88]}/video.mp4`
-    }
-}*/
-
-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=\S*(?=')/gm)
-
-    async match(match: RegExpMatchArray): Promise<string> {
-        return `https://streamtape.com/get_video?${match[0]}`
-    }
-}
-
-class Streamzz implements Match {
-    name = 'Streamzz'
-    id = 'streamzz'
-    reliability = Reliability.NORMAL
-    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.NORMAL
-    domains = [
-        'upstream.to'
-    ]
-    regex = new RegExp(/(?<=\|)\w{2,}/gm)
-
-    async match(match: RegExpMatchArray): Promise<string> {
-        return `https://${match[49]}.upstreamcdn.co/hls/${match[148]}/master.m3u8`
-    }
-}
-
-class Vidlox implements Match {
-    name = 'Vidlox'
-    id = 'vidlox'
-    reliability = Reliability.LOW
-    domains = [
-        'vidlox.me'
-    ]
-    regex = new RegExp(/(?<=\[")\S+?(?=")/gm)
-
-    async match(match: RegExpMatchArray): Promise<string> {
-        return match[0]
-    }
-}
-
-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 Vivo implements Match {
-    name = 'Vivo'
-    id = 'vivo'
-    reliability = Reliability.LOW
-    domains = [
-        'vivo.sx'
-    ]
-    regex = new RegExp(/(?<=source:\s')(\S+)(?=')/gms)
-
-    async match(match: RegExpMatchArray): Promise<string> {
-        return this.rot47(decodeURIComponent(match[0]))
+export async function getMatch(host: string): Promise<Match | undefined> {
+    if (await getAllDisabled()) {
+        return undefined
     }
 
-    // decrypts a string with the rot47 algorithm (https://en.wikipedia.org/wiki/ROT13#Variants)
-    rot47(encoded: string): string {
-        const s = []
-        for(let i = 0; i < encoded.length; i++) {
-            const j = encoded.charCodeAt(i)
-            if((j >= 33) && (j <= 126)) {
-                s[i] = String.fromCharCode(33+((j+ 14)%94))
-            } else {
-                s[i] = String.fromCharCode(j)
-            }
+    for (const match of matches) {
+        if (match.domains.some(v => host.indexOf(v) !== -1) && !((await getDisabled()).some(v => v === match))) {
+            return match
         }
-        return s.join('')
     }
 }
-
-class Voe implements Match {
-    name = 'Voe'
-    id = 'voe'
-    reliability = Reliability.HIGH
-    domains = [
-        'voe.sx',
-        'voeunblk.com'
-    ]
-    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]
-    }
-}
-
-export const matches = [
-    new Evoload(),
-    new Mixdrop(),
-    new Newgrounds(),
-    new Streamtape(),
-    new Streamzz(),
-    new Upstream(),
-    new Vidlox(),
-    new Vidoza(),
-    new Vivo(),
-    new Voe(),
-    new Vupload()
-]

src/match/matches.ts

@@ -0,0 +1,256 @@
+export enum Reliability {
+    HIGH = 1,
+    NORMAL,
+    LOW,
+}
+
+export abstract class Match {
+    name: string
+    id: string
+    reliability: Reliability
+    domains: string[]
+    regex: RegExp
+    abstract match(match: RegExpMatchArray): Promise<string>
+
+    notice?: string
+}
+
+// DOES NOT WORK.
+// The url can be extracted (sometimes??? wtf) without problems but to receive the actual video, custom request
+// headers must be set. And because the javascript and browser ecosystem is so fucked up, there is no good way to
+// do this with media which can be natively played with the browser, like here.
+class Doodstream implements Match {
+    name = 'Doodstream'
+    id = 'doodstream'
+    reliability = Reliability.HIGH
+    domains = [
+        'doodstream.com',
+        'dood.pm'
+    ]
+    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 Evoload implements Match {
+    name = 'Evoload'
+    id = 'evoload'
+    reliability = Reliability.NORMAL
+    domains = [
+        'evoload.io'
+    ]
+    regex = new RegExp(/.*/gm)
+
+    async match(match: RegExpMatchArray): Promise<string> {
+        const code = window.location.pathname.split('/').slice(-1)[0]
+        const response = await fetch('https://evoload.io/SecurePlayer', {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            body: JSON.stringify({code: code})
+        })
+
+        const json = await response.json()
+        return json['stream']['src']
+    }
+}
+
+class Mixdrop implements Match {
+    name = 'Mixdrop'
+    id = 'mixdrop'
+    reliability = Reliability.HIGH
+    domains = [
+        'mixdrop.co'
+    ]
+    regex = new RegExp(/(?<=\|)\w{2,}/gm)
+
+    async match(match: RegExpMatchArray): Promise<string> {
+        return `https://a-${match[1]}.${match[4]}.${match[5]}/v/${match[2]}.${match[6]}?s=${match[12]}&e=${match[13]}`
+    }
+}
+
+/*class Mp4Upload implements Match {
+    name = 'Mp4Upload'
+    id = 'mp4upload'
+    reliability = Reliability.LOW
+    domains = [
+        'mp4upload.com'
+    ]
+    regex = new RegExp(/(?<=\|)\w{2,}/gm)
+
+    async match(match: RegExpMatchArray): Promise<string> {
+        return `https://${match[34]}.mp4upload.com:${match[89]}/d/${match[88]}/video.mp4`
+    }
+}*/
+
+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(/\/get_video\S*(?=')/gm)
+
+    async match(match: RegExpMatchArray): Promise<string> {
+        return `https://streamtape.com${match[0]}`
+    }
+}
+
+class Streamzz implements Match {
+    name = 'Streamzz'
+    id = 'streamzz'
+    reliability = Reliability.NORMAL
+    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.NORMAL
+    domains = [
+        'upstream.to'
+    ]
+    regex = new RegExp(/(?<=\|)\w{2,}/gm)
+
+    async match(match: RegExpMatchArray): Promise<string> {
+        return `https://${match[49]}.upstreamcdn.co/hls/${match[148]}/master.m3u8`
+    }
+}
+
+class Vidlox implements Match {
+    name = 'Vidlox'
+    id = 'vidlox'
+    reliability = Reliability.LOW
+    domains = [
+        'vidlox.me'
+    ]
+    regex = new RegExp(/(?<=\[")\S+?(?=")/gm)
+
+    async match(match: RegExpMatchArray): Promise<string> {
+        return match[0]
+    }
+}
+
+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 Vivo implements Match {
+    name = 'Vivo'
+    id = 'vivo'
+    reliability = Reliability.LOW
+    domains = [
+        'vivo.sx'
+    ]
+    regex = new RegExp(/(?<=source:\s')(\S+)(?=')/gms)
+
+    async match(match: RegExpMatchArray): Promise<string> {
+        return this.rot47(decodeURIComponent(match[0]))
+    }
+
+    // decrypts a string with the rot47 algorithm (https://en.wikipedia.org/wiki/ROT13#Variants)
+    rot47(encoded: string): string {
+        const s = []
+        for(let i = 0; i < encoded.length; i++) {
+            const j = encoded.charCodeAt(i)
+            if((j >= 33) && (j <= 126)) {
+                s[i] = String.fromCharCode(33+((j+ 14)%94))
+            } else {
+                s[i] = String.fromCharCode(j)
+            }
+        }
+        return s.join('')
+    }
+}
+
+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]
+    }
+}
+
+export const matches = [
+    new Evoload(),
+    new Mixdrop(),
+    new Newgrounds(),
+    new Streamtape(),
+    new Streamzz(),
+    new Upstream(),
+    new Vidlox(),
+    new Vidoza(),
+    new Vivo(),
+    new Voe(),
+    new Vupload()
+]

src/store/store.ts

@@ -1,6 +1,6 @@
-import {Match, matches} from "../match/match";
+import {Match, matches} from "../match/matches";
 
-async function storageGet(key: string): Promise<any> {
+export async function storageGet(key: string): Promise<any> {
     return new Promise((resolve) => {
         chrome.storage.local.get(key, (value) => {
             resolve(value[key])
@@ -8,12 +8,16 @@ async function storageGet(key: string): Promise<any> {
     })
 }
 
-async function storageSet(key: string, value: any) {
+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 = []
 
@@ -29,7 +33,7 @@ export async function getDisabled(): Promise<Match[]> {
 
 export async function getAllDisabled(): Promise<boolean> {
     const value = await storageGet('all')
-    return value !== undefined ? value as unknown as boolean : false
+    return value !== undefined ? String(value).toLowerCase() === 'true' : false
 }
 
 export async function enableAll() {

src/ui/player/player.ts

@@ -1,4 +1,4 @@
-import {Match, matches, Reliability} from "../../match/match";
+import {Match, matches, Reliability} from "../../match/matches";
 // @ts-ignore
 import Hls from "hls.js";
 

src/ui/popup/popup.ts

@@ -1,5 +1,5 @@
 import {getDisabled, disable, enable, getAllDisabled, enableAll, disableAll} from "../../store/store";
-import {matches, Reliability} from "../../match/match";
+import {matches, Reliability} from "../../match/matches";
 
 async function main() {
     const disabled = await getDisabled()

tasks/build.ts

@@ -9,59 +9,11 @@ const sass = require('node-sass')
 const sassPluginNodeImport = require('node-sass-package-importer')
 const typescript = require('typescript')
 
-function getDomains() {
-    // because nodejs is nodejs, the simple commented out code below cannot be used.
-    // thus, the following bloated regexes must be used
-    /*const manifestMatches = []
-    for (const m of matches) {
-        for (const domain of m.domains) {
-            manifestMatches.push(`*://*.${domain}/*`)
-        }
-    }
-    manifest['content_scripts']['matches'] = manifestMatches*/
-
-    let domains = []
-
-    const matchesRegex = new RegExp(/export\s+const\s+matches\s+=\s+(?<matches>\[.*?])/gms)
-    const matchesClassesRegex = new RegExp(/(?<!\/\/\s*)new\s+(?<class>\w+)\(\)/gms)
-
-    const matchTs = fs.readFileSync('src/match/match.ts')
-    const jsMatches = matchesRegex.exec(matchTs).groups.matches
-    let m
-    while ((m = matchesClassesRegex.exec(jsMatches))) {
-        if (m.index === matchesClassesRegex.lastIndex) {
-            matchesClassesRegex.lastIndex++
-        }
-
-        if (m.groups.class !== undefined) {
-            const classDomainsRegex = new RegExp('class\\s+' + m.groups.class + '.*?domains\\s*=\\s*(?<domains>\\[.*?])', 'gms')
-            let mm
-            while ((mm = classDomainsRegex.exec(matchTs))) {
-                if (mm.index === classDomainsRegex.lastIndex) {
-                    classDomainsRegex.lastIndex++
-                }
-
-                if (mm.groups.domains !== undefined) {
-                    const matches = []
-                    for (const domain of JSON.parse(mm.groups.domains.replace(/'/g, '"', -1))) {
-                        matches.push(domain)
-                    }
-                    domains = domains.concat(matches)
-                }
-            }
-        }
-    }
-
-    return domains
-}
-
 async function buildManifest() {
     const manifest = JSON.parse(fs.readFileSync('src/manifest.json'))
 
     manifest['version'] = process.env.npm_package_version
 
-    manifest['content_scripts'][0]['matches'] = getDomains().map((domain) => {return `*://*.${domain}/*`})
-
     fs.writeFileSync('src/manifest.json', JSON.stringify(manifest, null, 2))
 }
 
@@ -115,6 +67,7 @@ async function buildJs() {
         '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)) {