Merge pull request #598 from Aldione/patch-14

Fix: preserve alias credentials on failover

Author: sparkison

app/Services/M3uProxyService.php

@@ -3,6 +3,7 @@
 namespace App\Services;
 
 use App\Facades\ProxyFacade;
+use App\Facades\PlaylistFacade;
 use App\Models\Channel;
 use App\Models\CustomPlaylist;
 use App\Models\Episode;
@@ -670,19 +671,15 @@ public function getChannelUrl($playlist, $channel, ?Request $request = null, ?St
         // See if channel has any failovers
         // Return bool if using resolver, else array of failover URLs (legacy mode)
         $failovers = $this->usingResolver()
-            ? $channel->failoverChannels()->count() > 0
-            : $channel->failoverChannels()
-            ->select(['channels.id', 'channels.url', 'channels.url_custom', 'channels.playlist_id', 'channels.custom_playlist_id'])->get()
-            ->map(function ($ch) {
-                $playlist = $ch->getEffectivePlaylist();
-                if (! $playlist) {
-                    return null;
-                }
-                return PlaylistUrlService::getChannelUrl($ch, $playlist);
-            })
-            ->filter()
-            ->values()
-            ->toArray();
+			? $channel->failoverChannels()->count() > 0
+			: $channel->failoverChannels()
+			->select(['channels.id', 'channels.url', 'channels.url_custom', 'channels.playlist_id', 'channels.custom_playlist_id'])->get()
+			->map(function ($ch) use ($playlist) {
+				return PlaylistUrlService::getChannelUrl($ch, $playlist);
+			})
+			->filter()
+			->values()
+			->toArray();
 
         // Use appropriate endpoint based on whether transcoding profile is provided
         if ($profile) {
@@ -1429,6 +1426,8 @@ public function resolveFailoverUrl(int $channelId, string $playlistUuid, string
             // Get the original channel to access its failover relationships
             $channel = Channel::findOrFail($channelId);
             $nextUrl = null;
+            // Resolve the original stream context by UUID (Playlist / MergedPlaylist / CustomPlaylist / PlaylistAlias)
+			$contextPlaylist = !empty($playlistUuid) ? PlaylistFacade::resolvePlaylistByUuid($playlistUuid) : null;
 
             // Get all failover channels with their relationships
             $failoverChannels = $channel->failoverChannels()
@@ -1459,7 +1458,7 @@ public function resolveFailoverUrl(int $channelId, string $playlistUuid, string
                 }
 
                 // Get the url
-                $url = PlaylistUrlService::getChannelUrl($failoverChannel, $failoverPlaylist);
+                $url = PlaylistUrlService::getChannelUrl($failoverChannel, $contextPlaylist ?? $failoverPlaylist);
 
                 // Check if the url is the current URL (skip it)
                 if ($url === $currentUrl) {