Updated version

.gitignore

@@ -0,0 +1 @@
+build/

README.md

@@ -6,6 +6,18 @@ This addon replaces the video player from this sides with the native player buil
 This has the advantage, that no advertising or popups are shown when trying to interact with the video (playing, skipping, ...) or some sites are showing them even if you do nothing.
 Additionally this enables you to download the video by right-clicking it and just choose the download option.
 
+<p align="center">
+  <a href="https://addons.mozilla.org/de/firefox/addon/stream-bypass/">
+    <img src="https://img.shields.io/amo/users/stream-bypass?label=Firefox%20Addon%20Store&style=flat-square" alt="Firefox Addon Store">
+  </a>
+  <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>
+
 Supported streaming providers (for a complete list of all supported websites, see [here](SUPPORTED) or in [show all](#all-supported-websites) below):
 - [streamtape.com](https://streamtape.com)
 - [vivo.sx](https://vivo.sx)
@@ -17,17 +29,18 @@ Supported streaming providers (for a complete list of all supported websites, se
 		<li><a href="https://evoload.io">evoload.io</a></li>
 		<li><a href="https://mcloud.to">mcloud.to</a></li>
 		<li><a href="https://mixdrop.co">mixdrop.co</a></li>
+		<li><a href="https://newgrounds.com">newgrounds.com</a></li>
 		<li><a href="https://streamtape.com">streamtape.com</a></li>
 		<li><a href="https://streamzz.to">streamzz.to</a></li>
 		<li><a href="https://thevideome.com">thevideome.com</a></li>
-		<li><a href="https://upstream.to">upstream.to</a></li>
 		<li><a href="https://vidlox.me">vidlox.me</a></li>
 		<li><a href="https://vidstream.pro">vidstream.pro</a></li>
 		<li><a href="https://vidoza.net">vidoza.net</a></li>
 		<li><a href="https://vivo.st">vivo.st</a></li>
 		<li><a href="https://vivo.sx">vivo.sx</a></li>
 		<li><a href="https://voe.sx">voe.sx</a></li>
-		<li><a href="https://vupload.com">vupload.com</a></li></ul>
+		<li><a href="https://vupload.com">vupload.com</a></li>
+</ul>
 </details>
 
 ---
@@ -38,10 +51,10 @@ Supported streaming providers (for a complete list of all supported websites, se
 </details>
 
 The addon was tested on
-- Firefox (95.0.2)
-- Ungoogled Chromium (96.0)
+- Firefox (96.0.3)
+- Ungoogled Chromium (97.0)
 - Vivaldi (5.0)
-- Opera (82.0)
+- Opera (83.0)
 
 ## Installing
 
@@ -51,7 +64,7 @@ Install the addon directly from the [firefox addon store](https://addons.mozilla
 
 ### Chromium / Google Chrome
 
-1. Download the `stream-bypass-<version>.zip` file 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).
+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.
@@ -59,7 +72,7 @@ Install the addon directly from the [firefox addon store](https://addons.mozilla
 
 ### Opera
 
-1. Download the `stream-bypass-<version>.zip` file 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).
+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.

SUPPORTED

@@ -1,10 +1,10 @@
 evoload.io
 mcloud.to
 mixdrop.co
+newgrounds.com
 streamtape.com
 streamzz.to
 thevideome.com
-upstream.to
 vidlox.me
 vidstream.pro
 vidoza.net

build.py

@@ -24,7 +24,8 @@ def load_matches():
         else:
             match = pattern.findall(line)
             if match:
-                matched.append(match[0])
+                if not line.strip().startswith('//'):
+                    matched.append(match[0])
             else:
                 break
 
@@ -36,7 +37,7 @@ def write_manifest():
     manifest = json.load(open('src/manifest.json', 'r'))
 
     for content_script in manifest['content_scripts']:
-        content_script['matches'] = [f'*://{match}/*' for match in matches]
+        content_script['matches'] = [f'*://*.{match}/*' for match in matches]
 
     json.dump(manifest, open('src/manifest.json', 'w'), indent=2)
 
@@ -66,7 +67,7 @@ def write_readme():
         # adds all available websites
         all_providers_regex = r'(?<=<ul>\n)(.+?)(?=</ul>)'
         domains = filter(lambda domain: domain != '', open('SUPPORTED', 'r').read().split('\n'))
-        all_providers = '\n'.join(f'\t\t<li><a href="https://{supported}">{supported}</a></li>' for supported in domains)
+        all_providers = '\n'.join(f'\t\t<li><a href="https://{supported}">{supported}</a></li>' for supported in domains) + '\n'
         readme = re.sub(all_providers_regex, all_providers, readme, flags=re.DOTALL)
 
         # adds all installed browsers to the tested browser section. i'm just to lazy to seek out all browser versions manually

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": "1.4.2",
+  "version": "1.6.0",
   "homepage_url": "https://github.com/ByteDream/stream-bypass",
   "browser_specific_settings": {
     "gecko": {
@@ -14,20 +14,20 @@
     {
       "all_frames": true,
       "matches": [
-        "*://evoload.io/*",
-        "*://mcloud.to/*",
-        "*://mixdrop.co/*",
-        "*://streamtape.com/*",
-        "*://streamzz.to/*",
-        "*://thevideome.com/*",
-        "*://upstream.to/*",
-        "*://vidlox.me/*",
-        "*://vidstream.pro/*",
-        "*://vidoza.net/*",
-        "*://vivo.st/*",
-        "*://vivo.sx/*",
-        "*://voe.sx/*",
-        "*://vupload.com/*"
+        "*://*.evoload.io/*",
+        "*://*.mcloud.to/*",
+        "*://*.mixdrop.co/*",
+        "*://*.newgrounds.com/*",
+        "*://*.streamtape.com/*",
+        "*://*.streamzz.to/*",
+        "*://*.thevideome.com/*",
+        "*://*.vidlox.me/*",
+        "*://*.vidstream.pro/*",
+        "*://*.vidoza.net/*",
+        "*://*.vivo.st/*",
+        "*://*.vivo.sx/*",
+        "*://*.voe.sx/*",
+        "*://*.vupload.com/*"
       ],
       "js": [
         "match.js",

src/match.ts

@@ -44,6 +44,19 @@ class Mixdrop implements Match {
     }
 }
 
+class Newgrounds implements Match {
+    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 {
     async match(match: RegExpMatchArray): Promise<string> {
         return `https://streamtape.com/get_video?${match[0]}`
@@ -58,7 +71,7 @@ class TheVideoMe implements Match {
 
 class Upstream implements Match {
     async match(match: RegExpMatchArray): Promise<string> {
-        return `https://${match[48]}.upstreamcdn.co/hls/,${match.sort((a, b) => {return b.length - a.length})[0]},.urlset/master.m3u8`
+        return `https://${match[47]}.upstreamcdn.co/hls/${match.sort((a, b) => {return b.length - a.length})[0]}/master.m3u8`
     }
 }
 
@@ -96,13 +109,6 @@ class Vivo implements Match {
     }
 }
 
-class Vupload implements Match {
-    async match(match: RegExpMatchArray): Promise<string> {
-        // the best quality is the last match so the array is reversed here to have the last element at the first position
-        return match.reverse()[0]
-    }
-}
-
 // all domains to match. the matches must be structured like this:
 //      [domain, regex match (can be null), class to call after match (can be null), reliability]
 // => the domain which should be redirected
@@ -118,15 +124,16 @@ const matches = [
     ['evoload.io', null, new Evoload(), Reliability.NORMAL],
     ['mcloud.to', new RegExp(/(?<=')\w+(?=';)/gm), new MCloud(), Reliability.NORMAL],
     ['mixdrop.co', new RegExp(/(?<=\|)\w{2,}/gm), new Mixdrop(), Reliability.HIGH],
+    ['newgrounds.com', null, new Newgrounds(), Reliability.HIGH],
     ['streamtape.com', new RegExp(/id=\S*(?=')/gm), new Streamtape(), Reliability.NORMAL],
     ['streamzz.to', new RegExp(/https?:\/\/get.streamz.tw\/getlink-\w+\.dll/gm), null, Reliability.NORMAL],
     ['thevideome.com', new RegExp(/(?<=\|)\w{2,}/gm), new TheVideoMe(), Reliability.NORMAL],
-    ['upstream.to', new RegExp(/(?<=\|)\w{2,}/gm), new Upstream(), Reliability.LOW],
+    //['upstream.to', new RegExp(/(?<=\|)\w{2,}/gm), new Upstream(), Reliability.LOW],
     ['vidlox.me', new RegExp(/(?<=\[")\S+?(?=")/gm), null, Reliability.NORMAL],
     ['vidstream.pro', new RegExp(/(?<=')\w+(?=';)/gm), new Vidstream(), Reliability.LOW],
     ['vidoza.net', new RegExp(/(?<=src:(\s*)?")\S*(?=")/gm), null, Reliability.NORMAL],
     ['vivo.st', new RegExp(/(?<=source:\s')(\S+)(?=')/gm), new Vivo(), Reliability.HIGH],
     ['vivo.sx', new RegExp(/(?<=source:\s')(\S+)(?=')/gm), new Vivo(), Reliability.HIGH],
     ['voe.sx', new RegExp(/https?:\/\/\S*m3u8(?=")/gm), null, Reliability.HIGH],
-    ['vupload.com', new RegExp(/(?<=src:\s?")\S+mp4/gm), new Vupload(), Reliability.NORMAL]
+    ['vupload.com', new RegExp(/(?<=src:\s?").+?(?=")/gm), null, Reliability.NORMAL]
 ]

src/res/hls.sass

@@ -9,4 +9,8 @@ html, body, video
 video
   position: absolute
   top: 0
-  left: 0
+  left: 0
+
+#message
+  color: white
+  text-align: center

src/res/hls.ts

@@ -27,7 +27,7 @@ function loadHls() {
 
             switch (rawReliability) {
                 case 1: // low
-                    message = `The reliability for this domain is low, so errors like this are common.
+                    message = `The reliability for this domain is low, errors like this are common.
                     Try to choose another streaming provider (if existent) or deactivate the addon for this domain (${searchParams.get('domain')}) and try again`
                     break
                 case 2: // normal
@@ -36,7 +36,7 @@ function loadHls() {
                 case 3: // high
                     message = `The reliability for this domains is high, errors like this are very unlikely to happen.
                     Try to refresh the page and if the error still exists you might want to open a new issue <a href="https://github.com/ByteDream/stream-bypass/issues/new">here</a>.
-                    When your using <a href="https://www.torproject.org/">Tor</a> such errors have a slight chance to occur more often,
+                    When you're using <a href="https://www.torproject.org/">Tor</a> such errors have a slight chance to occur more often,
                     so if this is the case just try to reload the page and see if you it's working then`
                     break
             }