clean-up reverse proxy URL detection

muxinc · Apr 26, 2024 · 428b02a · 428b02a
1 parent 3940672
commit 428b02a
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 24 deletions.
diff --git a/Sources/MuxPlayerSwift/GlobalLifecycle/PlayerSDK.swift b/Sources/MuxPlayerSwift/GlobalLifecycle/PlayerSDK.swift
@@ -103,33 +103,29 @@ class PlayerSDK {
         guard let components = URLComponents(
             url: urlAsset.url,
             resolvingAgainstBaseURL: false
-        ) else {
+        ), urlAsset.url.isReverseProxyable else {
             return
         }
 
-        if let port = components.port,
-           components.scheme == "http",
-           port == reverseProxyServer.port {
-            guard let originURLQueryComponentValue = components.queryItems?.first(
-                where: { $0.name == self.reverseProxyServer.originURLKey }
-            )?.value else {
-                // TODO: Handle more gracefully
-                fatalError("Invalid origin URL")
-            }
+        guard let originURLQueryComponentValue = components.queryItems?.first(
+            where: { $0.name == self.reverseProxyServer.originURLKey }
+        )?.value else {
+            // TODO: Handle more gracefully
+            fatalError("Invalid origin URL")
+        }
 
-            guard let originURL = URL(string: originURLQueryComponentValue) else {
-                // TODO: Handle more gracefully
-                fatalError("Invalid origin URL")
-            }
+        guard let originURL = URL(string: originURLQueryComponentValue) else {
+            // TODO: Handle more gracefully
+            fatalError("Invalid origin URL")
+        }
 
-            let playerItem = AVPlayerItem(
-                url: originURL
-            )
+        let playerItem = AVPlayerItem(
+            url: originURL
+        )
 
-            player.replaceCurrentItem(
-                with: playerItem
-            )
-        }
+        player.replaceCurrentItem(
+            with: playerItem
+        )
     }
 
     class KeyValueObservation {

diff --git a/Sources/MuxPlayerSwift/InternalExtensions/URL+Mux.swift b/Sources/MuxPlayerSwift/InternalExtensions/URL+Mux.swift
@@ -0,0 +1,22 @@
+//
+//  URL+Mux.swift
+//
+
+import Foundation
+
+internal extension URL {
+
+    var isReverseProxyable: Bool {
+        guard let components = URLComponents(
+            url: self,
+            resolvingAgainstBaseURL: false
+        ) else {
+            return false
+        }
+
+        return components.scheme == PlaybackURLConstants.reverseProxyScheme &&
+        components.port == PlaybackURLConstants.reverseProxyPort &&
+        components.host == PlaybackURLConstants.reverseProxyHost
+    }
+
+}
diff --git a/Sources/MuxPlayerSwift/PublicAPI/Extensions/AVPlayerItem+Mux.swift b/Sources/MuxPlayerSwift/PublicAPI/Extensions/AVPlayerItem+Mux.swift
@@ -5,6 +5,14 @@
 import AVFoundation
 import Foundation
 
+internal enum PlaybackURLConstants {
+    static let reverseProxyScheme = "http"
+
+    static let reverseProxyHost = "127.0.0.1"
+
+    static let reverseProxyPort = Int(1234)
+}
+
 fileprivate func makePlaybackURL(
     playbackID: String,
     playbackOptions: PlaybackOptions
@@ -89,9 +97,9 @@ fileprivate func makePlaybackURL(
         ]
 
         // TODO: currently enables reverse proxying unless caching is disabled
-        components.scheme = "http"
-        components.host = "127.0.0.1"
-        components.port = Int(1234)
+        components.scheme = PlaybackURLConstants.reverseProxyScheme
+        components.host = PlaybackURLConstants.reverseProxyHost
+        components.port = PlaybackURLConstants.reverseProxyPort
     }
 
     guard let playbackURL = components.url else {