Fix native player error message

README.md

@@ -68,11 +68,11 @@ 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)         | ❌         | 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) |
+|-----------------------------------------------------------------------|-----------|--------------------------------------------------|
+| [doodstream.com](doodstream.com) / [dood.pm](https://dood.pm)         | ✔️        |                                                  |
 | [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                                                                                                                 |
+| [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) | ✔         |                                                  |

package.json

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

src/index.ts

@@ -20,7 +20,19 @@ async function main() {
     }
 
     const url = await match.match(re)
-    location.assign(chrome.runtime.getURL(`ui/player/player.html?id=${match.id}&url=${encodeURIComponent(url)}`))
+
+    if (match.replace && !url.endsWith('.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()

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.1.0",
+  "version": "2.1.2",
   "homepage_url": "https://github.com/ByteDream/stream-bypass",
   "browser_specific_settings": {
     "gecko": {

src/match/matches.ts

@@ -9,24 +9,23 @@ export abstract class Match {
     id: string
     reliability: Reliability
     domains: string[]
+    replace?: boolean
     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'
+        'dood.pm',
+        'dood.ws'
     ]
+    replace = true
     regex = new RegExp(/(\/pass_md5\/.*?)'.*(\?token=.*?expiry=)/s)
 
     async match(match: RegExpMatchArray): Promise<string> {
@@ -68,30 +67,39 @@ class Evoload implements Match {
 class Mixdrop implements Match {
     name = 'Mixdrop'
     id = 'mixdrop'
-    reliability = Reliability.HIGH
+    reliability = Reliability.NORMAL
     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]}`
+        const prefix = /(?<=\/\/)[a|s](?=-)/.exec(document.body.innerHTML)[0]
+        const subdomain = match[1].length < match[2].length ? match[1] : match[2]
+        const domain = match.slice().sort((a, b) => b.length - a.length).find(m => /^[a-z]+$/.test(m))
+        const id = match[1].length > match[2].length ? match[1] : match[2]
+        const tld = match.find(m => ['net', 'io', 'to', 'sx', 'com'].indexOf(m) !== -1)
+        const s = match.slice().sort((a, b) => b.length - a.length).slice(1)[0]
+        const e_t = match.find(m => m.length === 10 && !isNaN(parseInt(m)))
+
+        return `https://${prefix}-${subdomain}.${domain}.${tld}/v/${id}.mp4?s=${s}&e=${e_t}&_t=${e_t}`
     }
 }
 
-/*class Mp4Upload implements Match {
+class Mp4Upload implements Match {
     name = 'Mp4Upload'
     id = 'mp4upload'
-    reliability = Reliability.LOW
+    reliability = Reliability.NORMAL
     domains = [
         'mp4upload.com'
     ]
+    replace = true
     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'
@@ -121,10 +129,10 @@ class Streamtape implements Match {
     domains = [
         'streamtape.com'
     ]
-    regex = new RegExp(/\/get_video\S*(?=')/gm)
+    regex = new RegExp(/id=.*(?=')/gm)
 
     async match(match: RegExpMatchArray): Promise<string> {
-        return `https://streamtape.com${match[0]}`
+        return `https://streamtape.com/get_video?${match.reverse()[0]}`
     }
 }
 
@@ -242,8 +250,10 @@ class Vupload implements Match {
 }
 
 export const matches = [
+    new Doodstream(),
     new Evoload(),
     new Mixdrop(),
+    new Mp4Upload(),
     new Newgrounds(),
     new Streamtape(),
     new Streamzz(),

src/ui/player/player.html

@@ -2,14 +2,16 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <title>HLS</title>
+    <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" hidden></p>
+<div id="message-container" hidden>
+    <p id="message"></p>
+    <br>
+    <p>Open a new issue <a href="https://github.com/ByteDream/stream-bypass/issues/new">here</a></p>
 </div>
 </body>
 </html>

src/ui/player/player.sass

@@ -15,8 +15,10 @@ video
   display: flex
   justify-content: center
   align-items: center
-  height: 100%
-
-  #message
+  flex-direction: column
   color: white
   text-align: center
+  height: 100%
+
+  & a, & a:visited
+    color: red

src/ui/player/player.ts

@@ -49,12 +49,12 @@ async function play_hls(url: string, match: Match) {
                     break
                 case Reliability.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 you're using <a href="https://www.torproject.org/">Tor</a> such errors have a slight chance to occur more often,
+                    Try to refresh the page and if the error still exists you might want to open a new issue.
+                    When you're using Tor, 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 it's working then`
                     break
             }
-            show_message(`Could not load HLS video. ${message}`)
+            show_message(`Could not load video. ${message}`)
         }
     } 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>')
@@ -65,13 +65,14 @@ async function main() {
     const urlQuery = new URLSearchParams(window.location.search)
     const id = urlQuery.get('id')
     const url = 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/new">here</a>`)
         return
     }
-    document.title = match.name
+    document.title = `Stream Bypass (${domain})`
 
     url.endsWith('.m3u8') ? await play_hls(url, match) : await play_native(url, match)
 }