Conditional proxying

I added a new feature. When instances are not proxied, Yattee first checks the URL to make sure it is not a restricted video. Usually, music videos and sports content can only be played back by the same IP address that requested the URL in the first place. That is why some videos do not play when the proxy is disabled.

This approach has multiple advantages. First and foremost, It reduced the load on Invidious/Piped instances, since users can now directly access the videos without going through the instance, which might be severely bandwidth limited. Secondly, users don't need to manually turn on the proxy when they want to watch IP address bound content, since Yattee automatically proxies such content.

Furthermore, adding the proxy option allows mitigating some severe playback issues with invidious instances. Invidious by default returns proxied URLs for videos, and due to some bug in the Invidious proxy, scrubbing or continuing playback at a random timestamp can lead to severe wait times for the users.

This should fix numerous playback issues: #666, #626, #590, #585, #498, #457, #400

Model/Player/Backends/AVPlayerBackend.swift

@@ -40,6 +40,11 @@ final class AVPlayerBackend: PlayerBackend {
 
     var isLoadingVideo = false
 
+    var hasStarted = false
+    var isPaused: Bool {
+        avPlayer.timeControlStatus == .paused
+    }
+
     var isPlaying: Bool {
         avPlayer.timeControlStatus == .playing
     }
@@ -158,6 +163,12 @@ final class AVPlayerBackend: PlayerBackend {
         }
 
         avPlayer.play()
+
+        // Setting hasStarted to true the first time player started
+        if !hasStarted {
+            hasStarted = true
+        }
+
         model.objectWillChange.send()
     }
 
@@ -180,6 +191,7 @@ final class AVPlayerBackend: PlayerBackend {
 
     func stop() {
         avPlayer.replaceCurrentItem(with: nil)
+        hasStarted = false
     }
 
     func cancelLoads() {

Model/Player/Backends/MPVBackend.swift

@@ -44,6 +44,8 @@ final class MPVBackend: PlayerBackend {
         }
     }}
 
+    var hasStarted = false
+    var isPaused = false
     var isPlaying = true { didSet {
         networkStateTimer.start()
 
@@ -337,7 +339,6 @@ final class MPVBackend: PlayerBackend {
     }
 
     func play() {
-        isPlaying = true
         startClientUpdates()
 
         if controls.presentingControls {
@@ -354,13 +355,22 @@ final class MPVBackend: PlayerBackend {
         }
 
         client?.play()
+
+        isPlaying = true
+        isPaused = false
+
+        // Setting hasStarted to true the first time player started
+        if !hasStarted {
+            hasStarted = true
+        }
     }
 
     func pause() {
-        isPlaying = false
         stopClientUpdates()
 
         client?.pause()
+        isPaused = true
+        isPlaying = false
     }
 
     func togglePlay() {
@@ -377,6 +387,9 @@ final class MPVBackend: PlayerBackend {
 
     func stop() {
         client?.stop()
+        isPlaying = false
+        isPaused = false
+        hasStarted = false
     }
 
     func seek(to time: CMTime, seekType _: SeekType, completionHandler: ((Bool) -> Void)?) {
@@ -392,8 +405,8 @@ final class MPVBackend: PlayerBackend {
     }
 
     func closeItem() {
-        client?.pause()
-        client?.stop()
+        pause()
+        stop()
         self.video = nil
         self.stream = nil
     }

Model/Player/Backends/PlayerBackend.swift

@@ -19,6 +19,8 @@ protocol PlayerBackend {
     var loadedVideo: Bool { get }
     var isLoadingVideo: Bool { get }
 
+    var hasStarted: Bool { get }
+    var isPaused: Bool { get }
     var isPlaying: Bool { get }
     var isSeeking: Bool { get }
     var playerItemDuration: CMTime? { get }

Model/Player/PlayerModel.swift

@@ -298,6 +298,14 @@ final class PlayerModel: ObservableObject {
         backend.isPlaying
     }
 
+    var isPaused: Bool {
+        backend.isPaused
+    }
+
+    var hasStarted: Bool {
+        backend.hasStarted
+    }
+
     var playerItemDuration: CMTime? {
         guard !currentItem.isNil else {
             return nil

Model/Player/PlayerQueue.swift

@@ -74,7 +74,7 @@ extension PlayerModel {
         preservedTime = currentItem.playbackTime
 
         DispatchQueue.main.async { [weak self] in
-            guard let self else { return }
+            guard let self = self else { return }
             guard let video = item.video else {
                 return
             }
@@ -94,7 +94,9 @@ extension PlayerModel {
                 }
             } else {
                 self.videoBeingOpened = nil
-                self.availableStreams = self.streamsWithInstance(instance: playerInstance, streams: video.streams)
+                self.streamsWithInstance(instance: playerInstance, streams: video.streams) { processedStreams in
+                    self.availableStreams = processedStreams
+                }
             }
         }
     }

Model/Player/PlayerStreams.swift

@@ -1,3 +1,4 @@
+import AVFoundation
 import Foundation
 import Siesta
 import SwiftUI
@@ -41,7 +42,9 @@ extension PlayerModel {
                         self.logger.info("ignoring loaded streams from \(instance.description) as current video has changed")
                         return
                     }
-                    self.availableStreams = self.streamsWithInstance(instance: instance, streams: video.streams)
+                    self.streamsWithInstance(instance: instance, streams: video.streams) { processedStreams in
+                        self.availableStreams = processedStreams
+                    }
                 } else {
                     self.logger.critical("no streams available from \(instance.description)")
                 }
@@ -53,20 +56,127 @@ extension PlayerModel {
             }
     }
 
-    func streamsWithInstance(instance: Instance, streams: [Stream]) -> [Stream] {
-        streams.map { stream in
-            stream.instance = instance
+    func streamsWithInstance(instance _: Instance, streams: [Stream], completion: @escaping ([Stream]) -> Void) {
+        let forbiddenAssetTestGroup = DispatchGroup()
+        var hasForbiddenAsset = false
 
-            if instance.app == .invidious, instance.proxiesVideos {
-                if let audio = stream.audioAsset {
-                    stream.audioAsset = InvidiousAPI.proxiedAsset(instance: instance, asset: audio)
-                }
-                if let video = stream.videoAsset {
-                    stream.videoAsset = InvidiousAPI.proxiedAsset(instance: instance, asset: video)
+        let (nonHLSAssets, hlsURLs) = getAssets(from: streams)
+
+        if let randomStream = nonHLSAssets.randomElement() {
+            let instance = randomStream.0
+            let asset = randomStream.1
+            let url = randomStream.2
+            let requestRange = randomStream.3
+
+            if let asset = asset, let instance = instance, !instance.proxiesVideos {
+                if instance.app == .invidious {
+                    testAsset(url: url, range: requestRange, isHLS: false, forbiddenAssetTestGroup: forbiddenAssetTestGroup) { isForbidden in
+                        hasForbiddenAsset = isForbidden
+                    }
+                } else if instance.app == .piped {
+                    testPipedAssets(asset: asset, requestRange: requestRange!, isHLS: false, forbiddenAssetTestGroup: forbiddenAssetTestGroup, completion: { isForbidden in
+                        hasForbiddenAsset = isForbidden
+                    })
                 }
             }
+        } else if let randomHLS = hlsURLs.randomElement() {
+            let instance = randomHLS.0
+            let asset = AVURLAsset(url: randomHLS.1)
 
-            return stream
+            if instance?.app == .piped {
+                testPipedAssets(asset: asset, requestRange: nil, isHLS: false, forbiddenAssetTestGroup: forbiddenAssetTestGroup, completion: { isForbidden in
+                    hasForbiddenAsset = isForbidden
+                })
+            }
+        }
+
+        forbiddenAssetTestGroup.notify(queue: .main) {
+            let processedStreams = streams.map { stream -> Stream in
+                if let instance = stream.instance {
+                    if instance.app == .invidious {
+                        if hasForbiddenAsset || instance.proxiesVideos {
+                            if let audio = stream.audioAsset {
+                                stream.audioAsset = InvidiousAPI.proxiedAsset(instance: instance, asset: audio)
+                            }
+                            if let video = stream.videoAsset {
+                                stream.videoAsset = InvidiousAPI.proxiedAsset(instance: instance, asset: video)
+                            }
+                        }
+                    } else if instance.app == .piped, !instance.proxiesVideos, !hasForbiddenAsset {
+                        if let hlsURL = stream.hlsURL {
+                            forbiddenAssetTestGroup.enter()
+                            PipedAPI.nonProxiedAsset(url: hlsURL) { nonProxiedURL in
+                                if let nonProxiedURL = nonProxiedURL {
+                                    stream.hlsURL = nonProxiedURL.url
+                                }
+                                forbiddenAssetTestGroup.leave()
+                            }
+                        } else {
+                            if let audio = stream.audioAsset {
+                                forbiddenAssetTestGroup.enter()
+                                PipedAPI.nonProxiedAsset(asset: audio) { nonProxiedAudioAsset in
+                                    stream.audioAsset = nonProxiedAudioAsset
+                                    forbiddenAssetTestGroup.leave()
+                                }
+                            }
+                            if let video = stream.videoAsset {
+                                forbiddenAssetTestGroup.enter()
+                                PipedAPI.nonProxiedAsset(asset: video) { nonProxiedVideoAsset in
+                                    stream.videoAsset = nonProxiedVideoAsset
+                                    forbiddenAssetTestGroup.leave()
+                                }
+                            }
+                        }
+                    }
+                }
+                return stream
+            }
+
+            forbiddenAssetTestGroup.notify(queue: .main) {
+                completion(processedStreams)
+            }
+        }
+    }
+
+    private func getAssets(from streams: [Stream]) -> (nonHLSAssets: [(Instance?, AVURLAsset?, URL, String?)], hlsURLs: [(Instance?, URL)]) {
+        var nonHLSAssets = [(Instance?, AVURLAsset?, URL, String?)]()
+        var hlsURLs = [(Instance?, URL)]()
+
+        for stream in streams {
+            if stream.isHLS {
+                if let url = stream.hlsURL?.url {
+                    hlsURLs.append((stream.instance, url))
+                }
+            } else {
+                if let asset = stream.audioAsset {
+                    nonHLSAssets.append((stream.instance, asset, asset.url, stream.requestRange))
+                }
+                if let asset = stream.videoAsset {
+                    nonHLSAssets.append((stream.instance, asset, asset.url, stream.requestRange))
+                }
+            }
+        }
+
+        return (nonHLSAssets, hlsURLs)
+    }
+
+    private func testAsset(url: URL, range: String?, isHLS: Bool, forbiddenAssetTestGroup: DispatchGroup, completion: @escaping (Bool) -> Void) {
+        let randomEnd = Int.random(in: 200 ... 800)
+        let requestRange = range ?? "0-\(randomEnd)"
+        let HTTPStatusForbidden = 403
+
+        forbiddenAssetTestGroup.enter()
+        URLTester.testURLResponse(url: url, range: requestRange, isHLS: isHLS) { statusCode in
+            completion(statusCode == HTTPStatusForbidden)
+            forbiddenAssetTestGroup.leave()
+        }
+    }
+
+    private func testPipedAssets(asset: AVURLAsset, requestRange: String?, isHLS: Bool, forbiddenAssetTestGroup: DispatchGroup, completion: @escaping (Bool) -> Void) {
+        PipedAPI.nonProxiedAsset(asset: asset) { nonProxiedAsset in
+            if let nonProxiedAsset = nonProxiedAsset {
+                self.testAsset(url: nonProxiedAsset.url, range: requestRange, isHLS: isHLS, forbiddenAssetTestGroup: forbiddenAssetTestGroup, completion: completion)
+            }
         }
     }