Update dependency versions and bump version to 2.1.5

package.json

@@ -1,6 +1,6 @@
 {
   "name": "stream-bypass",
-  "version": "2.1.1",
+  "version": "2.1.5",
   "description": "Multi-browser addon for multiple streaming providers which redirects directly to the source video",
   "main": "src/index.ts",
   "scripts": {
@@ -21,12 +21,12 @@
   "homepage": "https://github.com/ByteDream/stream-bypass#readme",
   "devDependencies": {
     "@rollup/plugin-commonjs": "^22.0.0",
-    "@rollup/plugin-node-resolve": "^13.3.0",
+    "@rollup/plugin-node-resolve": "^14.0.1",
     "@rollup/plugin-replace": "^4.0.0",
     "@rollup/plugin-typescript": "^8.3.3",
     "@typescript-eslint/eslint-plugin": "^5.27.1",
     "@typescript-eslint/parser": "^5.27.1",
-    "@types/chrome": "^0.0.190",
+    "@types/chrome": "^0.0.196",
     "@types/node-sass": "^4.11.2",
     "@types/yazl": "^2.4.2",
     "eslint": "^8.17.0",

src/background.ts

@@ -1,5 +1,5 @@
 import {getMatch} from "./match/match";
-import {storageGet, storageSet} from "./store/store";
+import {storageDelete, storageGet, storageSet} from "./store/store";
 import {Match} from "./match/matches";
 
 chrome.webRequest.onBeforeRedirect.addListener(async details => {
@@ -9,6 +9,8 @@ chrome.webRequest.onBeforeRedirect.addListener(async details => {
         if ((match = await getMatch(new URL(details.url).host)) !== undefined) {
             await storageSet('redirect', match.id)
         }
+    } else {
+        await storageDelete('redirect')
     }
 }, {
     urls: ['<all_urls>'],

src/index.ts

@@ -1,24 +1,23 @@
 import {getMatch} from "./match/match";
 import {storageDelete, storageGet} from "./store/store";
 import {Match, matches} from "./match/matches";
-import play = chrome.cast.media.timeout.play;
 
 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)
-            await storageDelete('redirect')
         } else {
             return
         }
     }
 
     const re = document.body.innerHTML.match(match.regex)
-    if (re === null) {
+    if (re === null) return
-        return
+    if (redirect) await storageDelete('redirect')
-    }
 
     const url = await match.match(re)
 
@@ -32,7 +31,7 @@ async function main() {
         document.body.innerHTML = ''
         document.body.append(player)
     } else {
-        window.location.assign(chrome.runtime.getURL(`ui/player/player.html?id=${match.id}&url=${encodeURIComponent(url)}&domains=${window.location.host}`))
+        window.location.assign(chrome.runtime.getURL(`ui/player/player.html?id=${match.id}&url=${encodeURIComponent(url)}&domain=${window.location.host}`))
     }
 }
 

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

src/match/matches.ts

@@ -19,11 +19,12 @@ export abstract class Match {
 class Doodstream implements Match {
     name = 'Doodstream'
     id = 'doodstream'
-    reliability = Reliability.HIGH
+    reliability = Reliability.NORMAL
     domains = [
         'doodstream.com',
         'dood.pm',
-        'dood.ws'
+        'dood.ws',
+        'dood.wf'
     ]
     replace = true
     regex = new RegExp(/(\/pass_md5\/.*?)'.*(\?token=.*?expiry=)/s)
@@ -67,14 +68,22 @@ 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}`
     }
 }
 
@@ -131,7 +140,7 @@ class Streamtape implements Match {
 class Streamzz implements Match {
     name = 'Streamzz'
     id = 'streamzz'
-    reliability = Reliability.NORMAL
+    reliability = Reliability.LOW
     domains = [
         'streamzz.to',
         'streamz.ws'

src/ui/player/player.html

@@ -9,7 +9,9 @@
 <body>
 <video id="video"></video>
 <div id="message-container">
-    <p id="message" hidden></p>
+    <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

@@ -1,22 +0,0 @@
-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
-  height: 100%
-
-  #message
-    color: white
-    text-align: center

src/ui/player/player.scss

@@ -0,0 +1,34 @@
+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
+  }
+}

src/ui/player/player.ts

@@ -4,14 +4,52 @@ import Hls from "hls.js";
 
 function show_message(message: string) {
     document.getElementById('message').innerText = message
-    document.getElementById('message-container').hidden = false
+    document.getElementById('message-container').style.visibility = 'visible'
     document.getElementById('video').hidden = true
 }
 
+async function check_loaded(match: Match, check: Promise<boolean>) {
+    const loaded = await new Promise((resolve, _) => {
+        setTimeout(() => {
+            resolve(false)
+        }, match.reliability * 3000)
+
+        check
+            .then(value => resolve(value))
+            .catch(_ => resolve(false))
+    })
+
+    if (!loaded) {
+        let message: string
+        switch (match.reliability) {
+            case Reliability.LOW:
+                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 provider (${match.name}) and try again`
+                break
+            case Reliability.NORMAL:
+                message = `The reliability for this domain is normal, errors like this can occur but are not very common. Try to refresh the page`
+                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.
+                    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 video. ${message}`)
+    }
+}
+
 async function play_native(url: string, match: Match) {
     const video = document.getElementById('video') as HTMLVideoElement
     video.controls = true
     video.src = url
+
+    const readyState = new Promise<boolean>((resolve, _) => {
+        video.onloadeddata = () => resolve(true)
+    })
+
+    await check_loaded(match, readyState)
 }
 
 async function play_hls(url: string, match: Match) {
@@ -27,35 +65,11 @@ async function play_hls(url: string, match: Match) {
         hls.loadSource(url)
         hls.attachMedia(video)
 
-        const loaded = await new Promise((resolve, reject) => {
+        const readyState = new Promise<boolean>((resolve, _) => {
-            setTimeout(() => {
+            video.onloadeddata = () => resolve(true)
-                resolve(false)
-            }, match.reliability * 3000)
-
-            hls.on(Hls.Events.MANIFEST_PARSED, () => {
-                resolve(true)
-            })
         })
 
-        if (!loaded) {
+        await check_loaded(match, readyState)
-            let message: string
-            switch (match.reliability) {
-                case Reliability.LOW:
-                    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 provider (${match.name}) and try again`
-                    break
-                case Reliability.NORMAL:
-                    message = `The reliability for this domain is normal, errors like this can occur but are not very common. Try to refresh the page`
-                    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,
-                    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}`)
-        }
     } 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>')
     }

src/ui/popup/popup.sass

@@ -1,56 +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
-
-
-#all
-  display: flex
-  justify-content: center
-  margin: 10px 0
-
-
-.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

src/ui/popup/popup.scss

@@ -0,0 +1,66 @@
+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;
+}
+
+#all {
+  display: flex;
+  justify-content: center;
+  margin: 10px 0
+}
+
+.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;
+}

tasks/build.ts

@@ -47,8 +47,8 @@ async function buildHtml() {
 
 async function buildCss() {
     const files = {
-        'src/ui/popup/popup.sass': 'build/ui/popup/popup.css',
+        'src/ui/popup/popup.scss': 'build/ui/popup/popup.css',
-        'src/ui/player/player.sass': 'build/ui/player/player.css'
+        'src/ui/player/player.scss': 'build/ui/player/player.css'
     }
 
     for (const [src, dst] of Object.entries(files)) {