Merge pull request #11 from BunnyWay/feature/remove-cdn

dejanskledar · web-flow · commit 6b775971d09c · 2025-04-16T14:45:07.000+02:00
Removed explicit CDN setting
diff --git a/Example-App/Example-App.xcodeproj/project.pbxproj b/Example-App/Example-App.xcodeproj/project.pbxproj
@@ -530,12 +530,11 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_ASSET_PATHS = "\"Example-App/Preview Content\"";
 				DEVELOPMENT_TEAM = "";
-				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = GX6PPA6X9F;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "Example-App/Info.plist";
@@ -557,7 +556,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = net.bunny.StreamSDKDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Stream SDK Demo App Development profile";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -569,12 +567,11 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
-				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_ASSET_PATHS = "\"Example-App/Preview Content\"";
-				DEVELOPMENT_TEAM = "";
-				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = GX6PPA6X9F;
+				DEVELOPMENT_TEAM = GX6PPA6X9F;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "Example-App/Info.plist";
@@ -596,7 +593,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = net.bunny.StreamSDKDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Stream SDK Demo Provisioning profile";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
diff --git a/Example-App/Example-App/App/ContentView.swift b/Example-App/Example-App/App/ContentView.swift
@@ -13,7 +13,6 @@ struct ContentView: View {
   @EnvironmentObject var dependenciesManager: DependenciesManager
   @State private var isShowingSheet = false
   @State private var tempAccessKey: String = ""
-  @State private var cdnHostname: String = ""
   @State private var libraryId: String = ""
   @State private var isStreamingPresented: Bool = false
   @State private var isShowingVideoIdAlert = false
@@ -79,7 +78,6 @@ struct ContentView: View {
     })
     .onAppear {
       tempAccessKey = dependenciesManager.accessKey
-      cdnHostname = dependenciesManager.cdnHostname
       libraryId = String(dependenciesManager.libraryId)
     }
   }
@@ -93,19 +91,14 @@ private extension ContentView {
     .sheet(isPresented: $isShowingSheet) {
       NavigationStack {
         Form {
-          Section("Access Key") {
-            TextField("Access your Key", text: $tempAccessKey)
+          Section("API Key") {
+            TextField("Enter your API Key", text: $tempAccessKey)
               .autocapitalization(.none)
               .disableAutocorrection(true)
             
           }
-          Section("CDN Hostname") {
-            TextField("Enter CDN Gostname", text: $cdnHostname)
-              .autocapitalization(.none)
-              .disableAutocorrection(true)
-          }
-          Section("Library ID") {
-            TextField("Enter Library ID", text: $libraryId)
+          Section("Video Library ID") {
+            TextField("Enter your Library ID", text: $libraryId)
               .keyboardType(.numberPad)
               .autocapitalization(.none)
               .disableAutocorrection(true)
@@ -131,7 +124,6 @@ private extension ContentView {
 
   private func saveConfig() {
     dependenciesManager.storedAccessKey = tempAccessKey
-    dependenciesManager.cdnHostname = cdnHostname
     dependenciesManager.libraryId = Int(libraryId) ?? .zero
     isShowingSheet = false
   }
diff --git a/Example-App/Example-App/App/DependenciesManager.swift b/Example-App/Example-App/App/DependenciesManager.swift
@@ -16,7 +16,6 @@ class DependenciesManager: ObservableObject {
   }
   @Published var accessKey: String
   
-  @AppStorage("cdnHostname") var cdnHostname: String = ""
   @AppStorage("libraryId") var libraryId: Int = .zero
   
   var tusVideoUploader: TUSVideoUploader
diff --git a/Example-App/Example-App/Resources/Localizable.xcstrings b/Example-App/Example-App/Resources/Localizable.xcstrings
@@ -14,13 +14,10 @@
     "%lld views" : {
 
     },
-    "Access Key" : {
-
-    },
-    "Access your Key" : {
+    "Actions" : {
 
     },
-    "Actions" : {
+    "API Key" : {
 
     },
     "BunnyStream Configuration" : {
@@ -34,23 +31,20 @@
     },
     "Cancel" : {
 
-    },
-    "CDN Hostname" : {
-
     },
     "Configuration" : {
 
     },
     "Direct Video Play" : {
 
     },
-    "Enter CDN Gostname" : {
+    "Enter Video ID" : {
 
     },
-    "Enter Library ID" : {
+    "Enter your API Key" : {
 
     },
-    "Enter Video ID" : {
+    "Enter your Library ID" : {
 
     },
     "Error: %@" : {
@@ -72,9 +66,6 @@
           }
         }
       }
-    },
-    "Library ID" : {
-
     },
     "No videos!" : {
 
@@ -111,6 +102,9 @@
     },
     "Video ID" : {
 
+    },
+    "Video Library ID" : {
+
     },
     "Video List" : {
 
diff --git a/Example-App/Example-App/Scenes/VideoPlayerDemo/Player/BunnyStreamPlayer+Default.swift b/Example-App/Example-App/Scenes/VideoPlayerDemo/Player/BunnyStreamPlayer+Default.swift
@@ -17,7 +17,6 @@ extension BunnyStreamPlayer {
       accessKey: accessKey,
       videoId: videoId,
       libraryId: dependenciesManager.libraryId,
-      cdn: dependenciesManager.cdnHostname,
       playerIcons: playerIcons
     )
   }
diff --git a/Example-App/Example-App/Scenes/VideoPlayerDemo/VideoList/VideoListRow.swift b/Example-App/Example-App/Scenes/VideoPlayerDemo/VideoList/VideoListRow.swift
@@ -10,8 +10,7 @@ import SwiftUI
 
 struct VideoListRow: View {
   var video: VideoResponseInfo
-  var cdn: String
-  
+
   var body: some View {
     ZStack {
       RoundedRectangle(cornerRadius: 16)
@@ -39,41 +38,42 @@ extension VideoListRow {
   var imageView: some View {
     GeometryReader { geometry in
       VStack {
-        AsyncImage(url: video.thumbnailFileURL(cdn: cdn)) { phase in
-          switch phase {
-          case .empty:
-            ProgressView()
-              .transition(.opacity)
-          case .success(let image):
-            image
-              .resizable()
-              .transition(.opacity)
-              .aspectRatio(contentMode: .fill)
-              .overlay {
-                LinearGradient(
-                  gradient: Gradient(
-                    colors: [
-                      .clear,
-                      .black.opacity(
-                        0.7
-                      )]
-                  ),
-                  startPoint: .center,
-                  endPoint: .bottom
-                )
-              }
-          case .failure:
+        // No Thumbnail is available at this time
+//        AsyncImage(url: video.thumbnailFileURL()) { phase in
+//          switch phase {
+//          case .empty:
+//            ProgressView()
+//              .transition(.opacity)
+//          case .success(let image):
+//            image
+//              .resizable()
+//              .transition(.opacity)
+//              .aspectRatio(contentMode: .fill)
+//              .overlay {
+//                LinearGradient(
+//                  gradient: Gradient(
+//                    colors: [
+//                      .clear,
+//                      .black.opacity(
+//                        0.7
+//                      )]
+//                  ),
+//                  startPoint: .center,
+//                  endPoint: .bottom
+//                )
+//              }
+//          case .failure:
             Image(systemName: "photo")
               .resizable()
               .foregroundColor(.black.opacity(0.2))
               .scaledToFit()
               .frame(width: 50)
               .transition(.opacity)
-          @unknown default:
-            EmptyView()
-          }
-        }
-        .clipped()
+//          @unknown default:
+//            EmptyView()
+//          }
+//        }
+//        .clipped()
       }
       .frame(width: geometry.size.width, height: 230)
     }
diff --git a/Example-App/Example-App/Scenes/VideoPlayerDemo/VideoList/VideoListView.swift b/Example-App/Example-App/Scenes/VideoPlayerDemo/VideoList/VideoListView.swift
@@ -30,10 +30,10 @@ struct VideoListView: View {
                 Button(action: {
                   selectedVideoInfo = videoInfo
                 }) {
-                  VideoListRow(video: videoInfo, cdn: dependenciesManager.cdnHostname)
+                  VideoListRow(video: videoInfo)
                 }
               } else {
-                VideoListRow(video: videoInfo, cdn: dependenciesManager.cdnHostname)
+                VideoListRow(video: videoInfo)
               }
             }
           }
diff --git a/Example-App/Example-App/Scenes/VideoPlayerDemo/VideoList/VideoResponseInfo.swift b/Example-App/Example-App/Scenes/VideoPlayerDemo/VideoList/VideoResponseInfo.swift
@@ -21,9 +21,9 @@ struct VideoResponseInfo: Hashable, Identifiable {
   var averageWatchTime: Int64
   var views: Int
   
-  func thumbnailFileURL(cdn: String) -> URL? {
-    guard let fileName = thumbnailFileName else { return nil }
-    return URL(string: "https://\(cdn)/\(id)/\(fileName)")
+  func thumbnailFileURL() -> URL? {
+    // No thumbnail URL available here
+    return nil
   }
   
   var formattedFileSize: String {
diff --git a/Sources/BunnyStreamPlayer/Model/Caption.swift b/Sources/BunnyStreamPlayer/Model/Caption.swift
@@ -3,8 +3,5 @@ import Foundation
 struct Caption: Hashable {
   var languageCode: String
   var label: String
-  
-  func url(cdn: String, videoId: String) -> URL? {
-    URL(string: "https://\(cdn)/\(videoId)/captions/\(languageCode).vtt?ver=1")
-  }
+  var captionsPath: String?
 }
diff --git a/Sources/BunnyStreamPlayer/Model/Video.swift b/Sources/BunnyStreamPlayer/Model/Video.swift
@@ -8,10 +8,11 @@ struct Video {
   var width: CGFloat
   var height: CGFloat
   var length: Double
-  var cdn: String
   var captions: [Caption]
   var libraryId: Int
   let resolutions: [Resolution]
+  var seekPath: String?
+  var playlistUrl: String?
 }
 
 extension Video {
@@ -29,18 +30,22 @@ extension Video {
   }
   
   func seekThumbnailURLs(thumbnailsPerImage: Int) -> [URL] {
+    guard let seekPath = seekPath else { return [] }
     let numberOfPreviews = Int(ceil(Double(thumbnailCount) / Double(thumbnailsPerImage)))
-    return (0..<numberOfPreviews).compactMap {
-      URL(string: "https://\(cdn)/\(guid)/seek/_\($0).jpg")
+    return (0..<numberOfPreviews).compactMap { index in
+      URL(string: "\(seekPath)/_\(index).jpg")
     }
   }
 }
 
 extension Video {
-  init(videoConfigResponse: VideoConfigResponse.Video, cdn: String) {
+  init(response: VideoConfigResponse) {
+    let videoConfigResponse = response.video
     let chapters = videoConfigResponse.chapters.map { Chapter(start: Double($0.start), end: Double($0.end), type: .regular(title: $0.title)) }
     let moments = videoConfigResponse.moments.map { Moment(label: $0.label, second: $0.timestamp)}
-    let captions = videoConfigResponse.captions.map { Caption(languageCode: $0.srclang, label: $0.label) }
+    let captions = videoConfigResponse.captions.map { 
+      Caption(languageCode: $0.srclang, label: $0.label, captionsPath: response.captionsPath)
+    }
     
     var computedResolutions = [Video.Resolution.auto]
     let resolutionStrings = videoConfigResponse.availableResolutions.split(separator: ",")
@@ -51,17 +56,20 @@ extension Video {
     }
     computedResolutions.sort { $0.bitrate < $1.bitrate }
      
-    self.init(guid: videoConfigResponse.guid,
-              chaptersList: ValidatedChapterList(originalChapters: chapters, duration: videoConfigResponse.length),
-              moments: moments,
-              thumbnailCount: videoConfigResponse.thumbnailCount,
-              width: CGFloat(videoConfigResponse.width),
-              height: CGFloat(videoConfigResponse.height),
-              length: videoConfigResponse.length,
-              cdn: cdn,
-              captions: captions,
-              libraryId: videoConfigResponse.videoLibraryId,
-              resolutions: computedResolutions)
+    self.init(
+      guid: videoConfigResponse.guid,
+      chaptersList: ValidatedChapterList(originalChapters: chapters, duration: videoConfigResponse.length),
+      moments: moments,
+      thumbnailCount: videoConfigResponse.thumbnailCount,
+      width: CGFloat(videoConfigResponse.width),
+      height: CGFloat(videoConfigResponse.height),
+      length: videoConfigResponse.length,
+      captions: captions,
+      libraryId: videoConfigResponse.videoLibraryId,
+      resolutions: computedResolutions,
+      seekPath: response.seekPath,
+      playlistUrl: response.videoPlaylistUrl
+    )
   }
 
   mutating func adjustLength(_ length: Double?) {
diff --git a/Sources/BunnyStreamPlayer/Player/BunnyStreamPlayer.swift b/Sources/BunnyStreamPlayer/Player/BunnyStreamPlayer.swift
diff --git a/Sources/BunnyStreamPlayer/Player/Loaders/HeatmapLoader.swift b/Sources/BunnyStreamPlayer/Player/Loaders/HeatmapLoader.swift
diff --git a/Sources/BunnyStreamPlayer/Player/Loaders/VideoConfigResponse.swift b/Sources/BunnyStreamPlayer/Player/Loaders/VideoConfigResponse.swift
diff --git a/Sources/BunnyStreamPlayer/Utilities/MediaPlayer/MediaPlayer+Fairplay.swift b/Sources/BunnyStreamPlayer/Utilities/MediaPlayer/MediaPlayer+Fairplay.swift
diff --git a/Sources/BunnyStreamPlayer/Utilities/MediaPlayer/MediaPlayerSubtitlesProvider.swift b/Sources/BunnyStreamPlayer/Utilities/MediaPlayer/MediaPlayerSubtitlesProvider.swift

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@ class DependenciesManager: ObservableObject {`
`16`	`16`	`}`
`17`	`17`	`@Published var accessKey: String`
`18`	`18`
`19`		`- @AppStorage("cdnHostname") var cdnHostname: String = ""`
`20`	`19`	`@AppStorage("libraryId") var libraryId: Int = .zero`
`21`	`20`
`22`	`21`	`var tusVideoUploader: TUSVideoUploader`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@ extension BunnyStreamPlayer {`
`17`	`17`	`accessKey: accessKey,`
`18`	`18`	`videoId: videoId,`
`19`	`19`	`libraryId: dependenciesManager.libraryId,`
`20`		`- cdn: dependenciesManager.cdnHostname,`
`21`	`20`	`playerIcons: playerIcons`
`22`	`21`	`)`
`23`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,10 +30,10 @@ struct VideoListView: View {`
`30`	`30`	`Button(action: {`
`31`	`31`	`selectedVideoInfo = videoInfo`
`32`	`32`	`}) {`
`33`		`- VideoListRow(video: videoInfo, cdn: dependenciesManager.cdnHostname)`
	`33`	`+ VideoListRow(video: videoInfo)`
`34`	`34`	`}`
`35`	`35`	`} else {`
`36`		`- VideoListRow(video: videoInfo, cdn: dependenciesManager.cdnHostname)`
	`36`	`+ VideoListRow(video: videoInfo)`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`	`}`