Apply reply payload from file validation

Author: carson-katri

Sources/LiveViewNative/Coordinators/LiveViewCoordinator.swift

@@ -111,34 +111,7 @@ public class LiveViewCoordinator<R: RootRegistry>: ObservableObject {
 
         let replyPayload = try await channel.call(event: .user(user: event), payload: payload, timeout: PUSH_TIMEOUT)
 
-        switch replyPayload {
-        case let .jsonPayload(json):
-            switch json {
-            case let .object(object):
-                if case let .object(diff) = object["diff"] {
-                    try self.handleDiff(payload: .object(object: diff), baseURL: self.url)
-                    if case let .object(reply) = diff["r"] {
-                        return reply
-                    }
-                } else if case let .object(redirectObject) = object["live_redirect"],
-                          let redirect = LiveRedirect(from: redirectObject, relativeTo: self.url)
-                {
-                    try await session.redirect(redirect)
-                } else if case let .object(redirectObject) = object["redirect"],
-                          case let .str(destinationString) = redirectObject["to"],
-                          let destination = URL(string: destinationString, relativeTo: self.url)
-                {
-                    try await session.redirect(.init(kind: .push, to: destination, mode: .replaceTop))
-                } else {
-                    return nil
-                }
-            default:
-                fatalError("unsupported message type \(replyPayload)")
-            }
-        default:
-            fatalError("unsupported message type \(replyPayload)")
-        }
-        return nil
+        return try await handleEventReplyPayload(replyPayload)
     }
 
     /// Creates a publisher that can be used to listen for server-sent LiveView events.
@@ -204,6 +177,37 @@ public class LiveViewCoordinator<R: RootRegistry>: ObservableObject {
         handleEvents(payload)
         try self.document?.mergeFragmentJson(String(data: try JSONEncoder().encode(payload), encoding: .utf8)!)
     }
+    
+    func handleEventReplyPayload(_ replyPayload: LiveViewNativeCore.Payload) async throws -> [String:Any]? {
+        switch replyPayload {
+        case let .jsonPayload(json):
+            switch json {
+            case let .object(object):
+                if case let .object(diff) = object["diff"] {
+                    try self.handleDiff(payload: .object(object: diff), baseURL: self.url)
+                    if case let .object(reply) = diff["r"] {
+                        return reply
+                    }
+                } else if case let .object(redirectObject) = object["live_redirect"],
+                          let redirect = LiveRedirect(from: redirectObject, relativeTo: self.url)
+                {
+                    try await session.redirect(redirect)
+                } else if case let .object(redirectObject) = object["redirect"],
+                          case let .str(destinationString) = redirectObject["to"],
+                          let destination = URL(string: destinationString, relativeTo: self.url)
+                {
+                    try await session.redirect(.init(kind: .push, to: destination, mode: .replaceTop))
+                } else {
+                    return nil
+                }
+            default:
+                fatalError("unsupported message type \(replyPayload)")
+            }
+        default:
+            fatalError("unsupported message type \(replyPayload)")
+        }
+        return nil
+    }
 
     private func handleEvents(_ json: LiveViewNativeCore.Json) {
         guard case let .object(object) = json,

Sources/LiveViewNative/Stylesheets/Modifiers/Files/FileImporterModifier.swift

@@ -70,34 +70,31 @@ struct _FileImporterModifier<R: RootRegistry>: ViewModifier {
             guard let liveChannel = context.coordinator.liveChannel
             else { return }
 
-            do {
-                let files = try result.get().map({ url in
-                    LiveFile(
-                        try Data(contentsOf: url),
-                        UTType(filenameExtension: url.pathExtension)!.preferredMIMEType!,
-                        url.lastPathComponent,
-                        id
-                    )
-                })
-                Task {
-                    do {
-                        for file in files {
-                            print(try await liveChannel.validateUpload(file))
-                        }
-                    } catch {
-                        logger.log(level: .error, "\(error.localizedDescription)")
+            Task {
+                do {
+                    let files = try result.get().map({ url in
+                        LiveFile(
+                            try Data(contentsOf: url),
+                            UTType(filenameExtension: url.pathExtension)!.preferredMIMEType!,
+                            url.lastPathComponent,
+                            id
+                        )
+                    })
+                    for file in files {
+                        let replyPayload = try await liveChannel.validateUpload(file)
+                        try await context.coordinator.handleEventReplyPayload(replyPayload)
                     }
+                    self.formModel?.fileUploads.append(
+                        contentsOf: files.map({ file in
+                            {
+                                try await liveChannel.uploadFile(file)
+                                print("upload complete")
+                            }
+                        })
+                    )
+                } catch {
+                    logger.log(level: .error, "\(error.localizedDescription)")
                 }
-                self.formModel?.fileUploads.append(
-                    contentsOf: files.map({ file in
-                        {
-                            try await liveChannel.uploadFile(file)
-                            print("upload complete")
-                        }
-                    })
-                )
-            } catch {
-                logger.log(level: .error, "\(error.localizedDescription)")
             }
         }
         #else