Try explore url if direct download failed

src/components/video-player/explore-url.ts

@@ -0,0 +1,68 @@
+import { Source, SourceType } from '../../normalize-source';
+import { proxies } from '../../settings';
+
+export const exploreUrl = async function(source: Source): Promise<Source> {
+    if (source.type !== SourceType.direct || source.src instanceof Blob) {
+        return source;
+    }
+
+    const attepmts: ((src: Source) => Generator<Source>)[] = [
+        tryAsIs,
+        tryFromQueryParams,
+        tryProxy,
+    ];
+
+    for (const attempt of attepmts) {
+        for (const result of attempt(source)) {
+            try {
+                const a = await fetch(result.src as string, { mode: 'cors', method: 'HEAD' });
+                return result;
+            } catch {
+            }
+        }
+    }
+
+    return source;
+};
+
+const tryAsIs = function* (source: Source): Generator<Source> {
+    yield source;
+};
+
+const tryFromQueryParams = function* (source: Source): Generator<Source> {
+    if (typeof source.src !== 'string') return source;
+    let url: URL;
+    try {
+        url = new URL(source.src);
+    } catch {
+        return source
+    }
+    for (const [_, value] of url.searchParams) {
+        try {
+            new URL(value);
+        } catch {
+            continue;
+        }
+        const result = new Source({ type: SourceType.direct, src: value });
+        yield result;
+        yield* tryFromQueryParams(result);
+    }
+};
+
+const tryProxy = function* (source: Source): Generator<Source> {
+    if (typeof source.src !== 'string') return source;
+
+    const paths = new URL(source.src).pathname.split('.');
+    const extenssion = paths[paths.length - 1];
+    const isHls = extenssion === 'm3u8';
+    if ((isHls && !proxies.hlsUrl) || (!isHls && !proxies.regularUrl)) {
+        yield source;
+    }
+    let src: string;
+    if (isHls) {
+        src = `${proxies.hlsUrl}/${btoa(source.src)}.m3u8`;
+    } else {
+        src = `${proxies.regularUrl}?url=${source.src}`;
+    }
+    yield new Source({ ...source, src });
+};

src/components/video-player/index.svelte

@@ -3,12 +3,12 @@
     import { derived, type Readable } from 'svelte/store';
     import { _ } from 'svelte-i18n';
     import { Source, SourceType } from '../../normalize-source';
+    import { exploreUrl } from './explore-url';
     import VideoPlayerVidstack from './video-player-vidstack.svelte';
     import VideoPlayerVime from './video-player-vime.svelte';
     import VideoPlayerMagnet from './player-magnet.svelte';
     import Loader from '../loader.svelte';
     import Inplayer from './inplayer.svelte';
-    import { proxies } from '../../settings';
     import { blob } from '../../stores/blob';
     import type { Room } from '../../stores/room';
     import { MessageType } from '../../stores/room/bound-messages';
@@ -43,32 +43,6 @@
         }
     });
 
-    const normalizeSource = async function(source: Source): Promise<Source> {
-        if (source.type !== SourceType.direct || (!proxies.hlsUrl && !proxies.regularUrl) || source.src instanceof Blob) {
-            return source;
-        }
-
-        const paths = new URL(source.src).pathname.split('.');
-        const extenssion = paths[paths.length - 1];
-        const isHls = extenssion === 'm3u8';
-        if ((isHls && !proxies.hlsUrl) || (!isHls && !proxies.regularUrl)) {
-            return source;
-        }
-
-        try {
-            await fetch(source.src, { mode: 'cors', method: 'HEAD' });
-            return source;
-        } catch {
-            let src = source.src;
-            if (isHls) {
-                src = `${proxies.hlsUrl}/${btoa(source.src)}.m3u8`;
-            } else {
-                src = `${proxies.regularUrl}?url=${source.src}`;
-            }
-            return new Source({ ...source, src });
-        }
-    };
-
     let watchMinuteAnalyticsTimeInterval: number;;
     onMount(() => {
         watchMinuteAnalyticsTimeInterval = setInterval(() => {
@@ -129,7 +103,7 @@
             </VideoPlayerVidstack>
         {:else}
             {#if $source}
-                {#await normalizeSource($source)}
+                {#await exploreUrl($source)}
                     <Loader/>
                 {:then normalizedSource}
                     {#if $playerType === 'vidstack'}
@@ -151,6 +125,7 @@
                     {:else if $playerType === 'magnet'}
                         <VideoPlayerMagnet
                             source={normalizedSource}
+                            room={room}
                             bind:paused={$paused}
                             bind:currentTime={$currentTime}
                             bind:muted={muted}

src/components/video-player/player-magnet.svelte

@@ -7,7 +7,9 @@
     import { sleep } from '../../utils';
     import VideoPlayerVidstack from './video-player-vidstack.svelte';
     import VideoSelectorBtn from '../video-selector-btn.svelte';
+    import type { Room } from '../../stores/room';
 
+    export let room: Room;
     export let source: Source;
     export let currentTime: number;
     export let paused: boolean;
@@ -31,7 +33,7 @@
             <div class="uk-margin-top uk-text-center">
                 { $_('player.isHostActive') }
                 <br class="uk-margin"/>
-                <VideoSelectorBtn forceLocal={true} />
+                <VideoSelectorBtn room={room} forceLocal={true} />
             </div>
             <div class="chat">
                 <slot name="chat" />