catalyst-core 0.3.0-beta.5 → 0.3.0-canary.2

package/dist/native/iosnativeWebView/Sources/Core/Utils/CacheManager.swift

@@ -1,19 +1,20 @@
 import Foundation
 import CryptoKit
 import os
+import CatalystCoreLogic
 
 private let logger = Logger(subsystem: Bundle.main.bundleIdentifier ?? "com.app", category: "CacheManager")
 
 public final class CacheManager {
     public static let shared = CacheManager()
     private let queue = DispatchQueue(label: "com.app.cachemanager", attributes: .concurrent)
-    
+
     enum CacheState {
         case fresh      // Content is within fresh window
         case stale     // Content is in stale-while-revalidate window
         case expired   // Content is expired
     }
-    
+
     private struct CachePolicy {
         static let freshWindow: TimeInterval = CatalystConstants.Cache.freshWindow
         static let staleWindow: TimeInterval = CatalystConstants.Cache.staleWindow
@@ -25,13 +26,13 @@ public final class CacheManager {
     private var resourceCache: [String: CachedResource] = [:]
     private let cacheDirectory: URL
     private let compiledCachePatterns: [NSRegularExpression]
-    
+
     private struct CachedResource: Codable {
         let data: Data
         let timestamp: Date
         let mimeType: String
         let urlString: String
-        
+
         var response: HTTPURLResponse? {
             guard let url = URL(string: urlString) else { return nil }
             return HTTPURLResponse(
@@ -42,7 +43,7 @@ public final class CacheManager {
             )
         }
     }
-    
+
     private init() {
         let initStart = CFAbsoluteTimeGetCurrent()
 
@@ -87,7 +88,7 @@ public final class CacheManager {
 
         loadCacheFromDisk()
     }
-    
+
     private func loadCacheFromDisk() {
         let loadStart = CFAbsoluteTimeGetCurrent()
 
@@ -117,17 +118,17 @@ public final class CacheManager {
             }
         }
     }
-    
+
     private func getCacheKey(for url: URL) -> String {
         let digest = SHA256.hash(data: Data(url.absoluteString.utf8))
         return digest.map { String(format: "%02x", $0) }.joined()
     }
-    
+
     private func getCacheFilePath(for url: URL) -> URL {
         return cacheDirectory.appendingPathComponent(getCacheKey(for: url))
             .appendingPathExtension("cache")
     }
-    
+
     func shouldCacheURL(_ url: URL) -> Bool {
         let urlString = url.absoluteString
 
@@ -146,10 +147,10 @@ public final class CacheManager {
         guard let url = request.url else { return false }
         return shouldCacheURL(url) || OfflineCacheService.shared.shouldCacheOfflineRouteSubresource(request)
     }
-    
+
     private func getCacheState(for timestamp: Date) -> CacheState {
         let age = Date().timeIntervalSince(timestamp)
-        
+
         if age <= CachePolicy.freshWindow {
             return .fresh
         } else if age <= (CachePolicy.freshWindow + CachePolicy.staleWindow) {
@@ -158,7 +159,7 @@ public final class CacheManager {
             return .expired
         }
     }
-    
+
     func getCachedResource(for request: URLRequest) async -> (Data?, CacheState, String?) {
         let manager = self
         return await withCheckedContinuation { continuation in
@@ -167,22 +168,22 @@ public final class CacheManager {
                     continuation.resume(returning: (nil, .expired, nil))
                     return
                 }
-                
+
                 if let cachedResource = manager.resourceCache[urlString] {
                     let state = manager.getCacheState(for: cachedResource.timestamp)
-                    
+
                     switch state {
                     case .fresh:
                         logger.info("🟢 Fresh cache hit for: \(urlString)")
                         continuation.resume(returning: (cachedResource.data, .fresh, cachedResource.mimeType))
-                        
+
                     case .stale:
                         logger.info("🟡 Stale cache hit for: \(urlString)")
                         Task {
                             await manager.revalidateResource(request: request)
                         }
                         continuation.resume(returning: (cachedResource.data, .stale, cachedResource.mimeType))
-                        
+
                     case .expired:
                         logger.info("🔴 Cache expired for: \(urlString)")
                         continuation.resume(returning: (nil, .expired, nil))
@@ -198,17 +199,17 @@ public final class CacheManager {
             }
         }
     }
-    
+
     private func revalidateResource(request: URLRequest) async {
         logger.info("🔄 Starting revalidation for: \(request.url?.absoluteString ?? "")")
         let fetchStartMs = CatalystPerf.nativeTimeMs()
-        
+
         do {
             let configuration = URLSessionConfiguration.ephemeral
             configuration.protocolClasses = []
             let networkSession = URLSession(configuration: configuration)
             let (data, response) = try await networkSession.data(for: request)
-            
+
             if let httpResponse = response as? HTTPURLResponse,
                isCacheableResponse(httpResponse, for: request) {
                 CatalystPerf.add([
@@ -227,20 +228,20 @@ public final class CacheManager {
             logger.error("Revalidation failed: \(error.localizedDescription)")
         }
     }
-    
+
     func storeCachedResponse(_ response: HTTPURLResponse, data: Data, for request: URLRequest) {
         queue.async(flags: .barrier) {
             guard let url = request.url else { return }
-            
+
             let resource = CachedResource(
                 data: data,
                 timestamp: Date(),
                 mimeType: response.mimeType ?? "application/octet-stream",
                 urlString: url.absoluteString
             )
-            
+
             self.resourceCache[url.absoluteString] = resource
-            
+
             let cachedResponse = CachedURLResponse(
                 response: response,
                 data: data,
@@ -248,7 +249,7 @@ public final class CacheManager {
                 storagePolicy: .allowed
             )
             self.session.configuration.urlCache?.storeCachedResponse(cachedResponse, for: request)
-            
+
             let cacheFile = self.getCacheFilePath(for: url)
             do {
                 let encodedData = try JSONEncoder().encode(resource)
@@ -259,29 +260,29 @@ public final class CacheManager {
             }
         }
     }
-    
+
     func clearCache() {
         queue.async(flags: .barrier) {
             self.resourceCache.removeAll()
             self.session.configuration.urlCache?.removeAllCachedResponses()
-            
+
             try? FileManager.default.removeItem(at: self.cacheDirectory)
             try? FileManager.default.createDirectory(
                 at: self.cacheDirectory,
                 withIntermediateDirectories: true,
                 attributes: nil
             )
-            
+
             logger.info("All caches cleared")
         }
     }
-    
+
     func createCacheableRequest(from url: URL) -> URLRequest {
         var request = URLRequest(url: url)
         request.cachePolicy = .returnCacheDataElseLoad
         return request
     }
-    
+
     func isCacheableResponse(_ response: HTTPURLResponse) -> Bool {
         guard let url = response.url else { return false }
         return (200...299 ~= response.statusCode) && shouldCacheURL(url)
@@ -308,7 +309,7 @@ public final class CacheManager {
             mimeType.hasSuffix("+json") ||
             mimeType == "text/event-stream"
     }
-    
+
     func getCacheStatistics() -> (memoryUsed: Int, diskUsed: Int) {
         let memoryUsed = session.configuration.urlCache?.currentMemoryUsage ?? 0
 

package/dist/native/iosnativeWebView/Sources/Core/Utils/CameraTransportUtils.swift

@@ -9,6 +9,7 @@
 import Foundation
 import UIKit
 import os
+import CatalystCoreLogic
 
 private let logger = Logger(subsystem: Bundle.main.bundleIdentifier ?? "com.app", category: "CameraTransportUtils")
 
@@ -360,4 +361,4 @@ class CameraTransportUtils {
         formatter.countStyle = .file
         return formatter.string(fromByteCount: bytes)
     }
-}
+}

package/dist/native/iosnativeWebView/Sources/Core/Utils/DeviceInfoUtils.swift

@@ -8,6 +8,7 @@
 import Foundation
 import UIKit
 import os
+import CatalystCoreLogic
 
 private let logger = Logger(subsystem: Bundle.main.bundleIdentifier ?? "com.app", category: "DeviceInfoUtils")
 
@@ -36,7 +37,6 @@ class DeviceInfoUtils {
         ]
 
         deviceInfo["appInfo"] = ConfigConstants.appInfo
-        
 
         logger.debug("Device info retrieved successfully: \(deviceInfo.description)")
         return deviceInfo

package/dist/native/iosnativeWebView/Sources/Core/Utils/FilePickerHandler.swift

@@ -10,6 +10,7 @@ import UIKit
 import UniformTypeIdentifiers
 import PhotosUI
 import os
+import CatalystCoreLogic
 
 private let logger = Logger(subsystem: Bundle.main.bundleIdentifier ?? "com.app", category: "FilePickerHandler")
 
@@ -182,7 +183,7 @@ class FilePickerHandler: NSObject {
         // Use photo picker if all MIME types are images/videos, else use document picker
         let mimeTypes = options.mimeType.lowercased().split(separator: ",").map { $0.trimmingCharacters(in: .whitespaces) }
         let allMedia = mimeTypes.allSatisfy { $0.hasPrefix("image/") || $0.hasPrefix("video/") }
-        
+
         if allMedia, #available(iOS 14.0, *) {
             presentPhotoPicker(from: viewController, options: options)
         } else {
@@ -197,7 +198,7 @@ class FilePickerHandler: NSObject {
         let mimeTypes = options.mimeType.lowercased().split(separator: ",").map { $0.trimmingCharacters(in: .whitespaces) }
         let hasImages = mimeTypes.contains { $0.hasPrefix("image/") }
         let hasVideos = mimeTypes.contains { $0.hasPrefix("video/") }
-        
+
         var config = PHPickerConfiguration()
         config.selectionLimit = options.selectionLimit
         config.filter = (hasImages && hasVideos) ? .any(of: [.images, .videos]) : hasVideos ? .videos : .images
@@ -377,6 +378,9 @@ class FilePickerHandler: NSObject {
         )
     }
 
+    // A per-extension MIME lookup table expressed as a `switch` — the
+    // branch count is the number of extensions mapped.
+    // swiftlint:disable:next cyclomatic_complexity
     private func getMimeType(for url: URL) -> String {
         // First try UTType - only return if it has a preferredMIMEType
         if let utType = UTType(filenameExtension: url.pathExtension),
@@ -386,7 +390,7 @@ class FilePickerHandler: NSObject {
 
         // Fallback based on file extension with comprehensive mapping
         let ext = url.pathExtension.lowercased()
-        
+
         switch ext {
         // Images
         case "jpg", "jpeg": return "image/jpeg"
@@ -399,7 +403,7 @@ class FilePickerHandler: NSObject {
         case "heif": return "image/heif"
         case "ico": return "image/x-icon"
         case "tiff", "tif": return "image/tiff"
-        
+
         // Documents
         case "pdf": return "application/pdf"
         case "doc": return "application/msword"
@@ -408,25 +412,25 @@ class FilePickerHandler: NSObject {
         case "xlsx": return "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
         case "ppt": return "application/vnd.ms-powerpoint"
         case "pptx": return "application/vnd.openxmlformats-officedocument.presentationml.presentation"
-        
+
         // Text
         case "txt": return "text/plain"
         case "html", "htm": return "text/html"
         case "css": return "text/css"
         case "csv": return "text/csv"
-        
+
         // Data
         case "json": return "application/json"
         case "xml": return "application/xml"
         case "js": return "application/javascript"
-        
+
         // Archives
         case "zip": return "application/zip"
         case "rar": return "application/x-rar-compressed"
         case "7z": return "application/x-7z-compressed"
         case "tar": return "application/x-tar"
         case "gz": return "application/gzip"
-        
+
         // Video
         case "mp4": return "video/mp4"
         case "mov": return "video/quicktime"
@@ -435,7 +439,7 @@ class FilePickerHandler: NSObject {
         case "mkv": return "video/x-matroska"
         case "m4v": return "video/x-m4v"
         case "flv": return "video/x-flv"
-        
+
         // Audio
         case "mp3": return "audio/mpeg"
         case "wav": return "audio/wav"
@@ -444,7 +448,7 @@ class FilePickerHandler: NSObject {
         case "aac": return "audio/aac"
         case "flac": return "audio/flac"
         case "wma": return "audio/x-ms-wma"
-        
+
         default:
             logger.warning("Unknown file extension '\(ext)', using application/octet-stream")
             return "application/octet-stream"
@@ -517,7 +521,6 @@ class FilePickerHandler: NSObject {
         }
     }
 
-
     private func processFileWithFrameworkServer(url: URL, metadata: FileMetadata) -> FileProcessingResult {
         logger.info("Processing file with framework server transport")
 
@@ -821,14 +824,14 @@ extension FilePickerHandler: PHPickerViewControllerDelegate {
             "public.png",
             "public.gif"
         ]
-        
+
         // Check if any specific image type is available
         for specificType in specificImageTypes {
             if itemProvider.hasItemConformingToTypeIdentifier(specificType) {
                 return specificType
             }
         }
-        
+
         // Check for specific video types
         let specificVideoTypes = [
             UTType.mpeg4Movie.identifier,
@@ -836,13 +839,13 @@ extension FilePickerHandler: PHPickerViewControllerDelegate {
             "public.mpeg-4",
             "com.apple.quicktime-movie"
         ]
-        
+
         for specificType in specificVideoTypes {
             if itemProvider.hasItemConformingToTypeIdentifier(specificType) {
                 return specificType
             }
         }
-        
+
         // Fall back to generic types
         if itemProvider.hasItemConformingToTypeIdentifier(UTType.image.identifier) {
             return UTType.image.identifier
@@ -971,7 +974,7 @@ extension FilePickerHandler: PHPickerViewControllerDelegate {
             fileExtension = "dat"
             logger.warning("Unknown type identifier '\(typeIdentifier)', defaulting to 'dat' extension")
         }
-        
+
         logger.debug("Using file extension '\(fileExtension)' from type identifier fallback")
         return fileExtension
     }
@@ -980,12 +983,12 @@ extension FilePickerHandler: PHPickerViewControllerDelegate {
         guard let utType = UTType(typeIdentifier) else {
             return nil
         }
-        
+
         // If UTType has a preferred MIME type, return it
         if let mimeType = utType.preferredMIMEType {
             return mimeType
         }
-        
+
         // Handle generic types by checking if they conform to specific types
         if utType.conforms(to: .jpeg) {
             return "image/jpeg"
@@ -1000,7 +1003,7 @@ extension FilePickerHandler: PHPickerViewControllerDelegate {
         } else if utType.conforms(to: .movie) {
             return "video/mp4"  // Default for generic videos
         }
-        
+
         return nil
     }
 }