Fix AsyncImage video support

Author: jkmassel

Modules/Sources/AsyncImageKit/Views/AsyncVideoThumbnailView.swift

@@ -1,4 +1,6 @@
 import Foundation
+import AVFoundation
+import AsyncImageKit
 import WordPressCoreProtocols
 
 // This file is all module-internal and provides sample data for UI development
@@ -9,7 +11,8 @@ extension SupportDataProvider {
         botConversationDataProvider: InternalBotConversationDataProvider(),
         userDataProvider: InternalUserDataProvider(),
         supportConversationDataProvider: InternalSupportConversationDataProvider(),
-        diagnosticsDataProvider: InternalDiagnosticsDataProvider()
+        diagnosticsDataProvider: InternalDiagnosticsDataProvider(),
+        mediaHost: InternalMediaHost()
     )
 
     static let applicationLog = ApplicationLog(path: URL(filePath: #filePath), createdAt: Date(), modifiedAt: Date())
@@ -434,3 +437,13 @@ actor InternalDiagnosticsDataProvider: DiagnosticsDataProvider {
         }
     }
 }
+
+actor InternalMediaHost: MediaHostProtocol {
+    func authenticatedRequest(for url: URL) async throws -> URLRequest {
+        URLRequest(url: url)
+    }
+
+    func authenticatedAsset(for url: URL) async throws -> AVURLAsset {
+        AVURLAsset(url: url)
+    }
+}

Modules/Sources/Support/InternalDataProvider.swift

@@ -1,4 +1,5 @@
 import Foundation
+import AsyncImageKit
 import WordPressCoreProtocols
 
 public enum SupportFormAction {
@@ -33,6 +34,7 @@ public final class SupportDataProvider: ObservableObject, Sendable {
     private let userDataProvider: CurrentUserDataProvider
     private let supportConversationDataProvider: SupportConversationDataProvider
     private let diagnosticsDataProvider: DiagnosticsDataProvider
+    let mediaHost: MediaHostProtocol
 
     private weak var supportDelegate: SupportDelegate?
 
@@ -42,13 +44,15 @@ public final class SupportDataProvider: ObservableObject, Sendable {
         userDataProvider: CurrentUserDataProvider,
         supportConversationDataProvider: SupportConversationDataProvider,
         diagnosticsDataProvider: DiagnosticsDataProvider,
+        mediaHost: MediaHostProtocol,
         delegate: SupportDelegate? = nil
     ) {
         self.applicationLogProvider = applicationLogProvider
         self.botConversationDataProvider = botConversationDataProvider
         self.userDataProvider = userDataProvider
         self.supportConversationDataProvider = supportConversationDataProvider
         self.diagnosticsDataProvider = diagnosticsDataProvider
+        self.mediaHost = mediaHost
         self.supportDelegate = delegate
     }
 

Modules/Sources/Support/SupportDataProvider.swift

@@ -31,18 +31,41 @@ struct SingleImageView: View {
 }
 
 struct SingleVideoView: View {
-    private let player: AVPlayer
 
-    init(url: URL) {
-        self.player = AVPlayer(url: url)
+    @State
+    private var player: AVPlayer? = nil
+
+    private let url: URL
+    private let host: MediaHostProtocol?
+
+    init(url: URL, host: MediaHostProtocol? = nil) {
+        self.url = url
+        self.host = host
     }
 
     var body: some View {
-        VideoPlayer(player: player)
-            .ignoresSafeArea()
-            .onAppear {
-                self.player.play()
+        Group {
+            if let player {
+                VideoPlayer(player: player)
+                    .ignoresSafeArea()
+                    .onAppear {
+                        player.play()
+                    }
+            } else {
+                FullScreenProgressView("Loading Video")
+            }
+        }.task {
+            if let host {
+                do {
+                    let asset = try await host.authenticatedAsset(for: url)
+                    self.player = AVPlayer(playerItem: AVPlayerItem(asset: asset))
+                } catch {
+                    debugPrint(error.localizedDescription)
+                }
+            } else {
+                self.player = AVPlayer(url: url)
             }
+        }
     }
 }
 
@@ -98,6 +121,10 @@ struct AttachmentListView: View {
 }
 
 struct AttachmentThumbnailView: View {
+
+    @EnvironmentObject
+    private var supportDataProvider: SupportDataProvider
+
     let attachment: Attachment
 
     var body: some View {
@@ -107,37 +134,41 @@ struct AttachmentThumbnailView: View {
             }
 
             if attachment.isVideo {
-                SingleVideoView(url: attachment.url)
+                SingleVideoView(url: attachment.url, host: supportDataProvider.mediaHost)
             }
         } label: {
             ZStack {
                 if attachment.isImage {
-                    CachedAsyncImage(url: attachment.url) { image in
+                    CachedAsyncImage(url: attachment.url, host: supportDataProvider.mediaHost, mutability: .immutable) { image in
                         image
                             .resizable()
                             .aspectRatio(contentMode: .fill)
                     } placeholder: {
                         Color.gray.opacity(0.2).overlay {
                             ProgressView()
                         }
+
                     }
                 }
 
                 if attachment.isVideo {
-                    CachedAsyncVideoPreview(url: attachment.url) { image in
-                        image
-                            .resizable()
-                            .aspectRatio(contentMode: .fill)
-                            .overlay {
-                                Image(systemName: "play.circle")
-                                    .foregroundStyle(Color.white)
+                    CachedAsyncImage(
+                        videoUrl: attachment.url,
+                        host: supportDataProvider.mediaHost,
+                        mutability: .immutable
+                    ) { image in
+                            image
+                                .resizable()
+                                .aspectRatio(contentMode: .fill)
+                                .overlay {
+                                    Image(systemName: "play.circle")
+                                        .foregroundStyle(Color.white)
+                                }
+                        } placeholder: {
+                            Color.gray.opacity(0.2).overlay {
+                                ProgressView()
                             }
-
-                    } placeholder: {
-                        Color.gray.opacity(0.2).overlay {
-                            ProgressView()
                         }
-                    }
                 }
             }
             .frame(width: 80, height: 80)

Modules/Sources/Support/UI/Support Conversations/AttachmentListView.swift

@@ -25,6 +25,7 @@ extension SupportDataProvider {
             wpcomClient: WordPressDotComClient()
         ),
         diagnosticsDataProvider: WpDiagnosticsDataProvider(),
+        mediaHost: WordPressDotComClient(),
         delegate: WpSupportDelegate()
     )
 }