feat: Enhance concurrency support and code structure

- Added `Sendable` conformance to various structs and enums to improve thread safety.
- Introduced `@MainActor` annotations to ensure UI updates occur on the main thread.
- Refactored `Version` struct to simplify bundle access.
- Updated `Binding` extensions to support `Sendable` types.
- Improved error handling and state management in `DeviceAuthorization` and `PasteboardObserver`.
- Enhanced `VCamAction` and related types for better concurrency handling.
- Added new `FacialEstimator` and `FacialExpressionEstimator` structs for improved facial tracking.
- Refined `VCamUI` components for better performance and maintainability.
- Updated various UI components to ensure they are thread-safe and responsive.

Author: tattn

.github/workflows/ci.yml

@@ -9,7 +9,7 @@ on:
   workflow_dispatch:
 
 env:
-  DEVELOPER_DIR: "/Applications/Xcode_26.0.app/Contents/Developer"
+  DEVELOPER_DIR: "/Applications/Xcode_26.2.app/Contents/Developer"
 
 jobs:
   build-package:

app/xcode/App/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.9
+// swift-tools-version: 6.2
 
 import PackageDescription
 

app/xcode/Sources/VCamBridge/Cursor.swift

@@ -1,10 +1,3 @@
-//
-//  Cursor.swift
-//  
-//
-//  Created by Tatsuya Tanaka on 2022/05/21.
-//
-
 import AppKit
 import VCamUIFoundation
 
@@ -26,7 +19,7 @@ enum CursorType: Int {
 }
 
 @_cdecl("uniPushCursor")
-public func uniPushCursor(_ type: Int) {
+@MainActor public func uniPushCursor(_ type: Int) {
     guard let cursor = CursorType(rawValue: type) else { return }
     switch cursor {
     case .northWestSouthEastResize, .northEastSouthWestResize, .move:
@@ -36,6 +29,6 @@ public func uniPushCursor(_ type: Int) {
 }
 
 @_cdecl("uniPopCursor")
-public func uniPopCursor() {
+@MainActor public func uniPopCursor() {
     NSCursor.popForSwiftUI()
 }

app/xcode/Sources/VCamBridge/FilePicker.swift

@@ -1,22 +1,12 @@
-//
-//  FilePicker.swift
-//  
-//
-//  Created by Tatsuya Tanaka on 2022/05/05.
-//
-
 import AppKit
 import VCamUIFoundation
 
 @_cdecl("uniOpenFile")
-public func uniOpenFile(_ fileType: Int, _ handler: @escaping @convention(c) (UnsafePointer<CChar>) -> Void) {
+@MainActor public func uniOpenFile(_ fileType: Int, _ handler: @escaping @Sendable @convention(c) (UnsafePointer<CChar>) -> Void) {
     guard let type = FileUtility.FileType(rawValue: fileType) else {
         handler(("" as NSString).utf8String!)
         return
     }
-    if let url = FileUtility.openFile(type: type) {
-        handler((url.path as NSString).utf8String!)
-    } else {
-        handler(("" as NSString).utf8String!)
-    }
+    let path = FileUtility.openFile(type: type)?.path ?? ""
+    handler((path as NSString).utf8String!)
 }

app/xcode/Sources/VCamBridge/TrackingMappingEntry.swift

@@ -96,13 +96,13 @@ public extension TrackingMappingEntry.Key {
     }
 }
 
-extension TrackingMappingEntry.InputKey: Codable {
-    private enum CodingKeys: String, CodingKey {
-        case key, boundsMin, boundsMax, rangeMin, rangeMax
-    }
+private enum RangeKeyCodingKeys: String, CodingKey {
+    case key, boundsMin, boundsMax, rangeMin, rangeMax
+}
 
+extension TrackingMappingEntry.InputKey: Codable {
     public init(from decoder: any Decoder) throws {
-        let container = try decoder.container(keyedBy: CodingKeys.self)
+        let container = try decoder.container(keyedBy: RangeKeyCodingKeys.self)
         let key = try container.decode(String.self, forKey: .key)
         let boundsMin = try container.decode(Float.self, forKey: .boundsMin)
         let boundsMax = try container.decode(Float.self, forKey: .boundsMax)
@@ -112,7 +112,7 @@ extension TrackingMappingEntry.InputKey: Codable {
     }
 
     public func encode(to encoder: any Encoder) throws {
-        var container = encoder.container(keyedBy: CodingKeys.self)
+        var container = encoder.container(keyedBy: RangeKeyCodingKeys.self)
         try container.encode(key, forKey: .key)
         try container.encode(bounds.lowerBound, forKey: .boundsMin)
         try container.encode(bounds.upperBound, forKey: .boundsMax)
@@ -122,12 +122,8 @@ extension TrackingMappingEntry.InputKey: Codable {
 }
 
 extension TrackingMappingEntry.OutputKey: Codable {
-    private enum CodingKeys: String, CodingKey {
-        case key, boundsMin, boundsMax, rangeMin, rangeMax
-    }
-
     public init(from decoder: any Decoder) throws {
-        let container = try decoder.container(keyedBy: CodingKeys.self)
+        let container = try decoder.container(keyedBy: RangeKeyCodingKeys.self)
         let key = try container.decode(String.self, forKey: .key)
         let boundsMin = try container.decode(Float.self, forKey: .boundsMin)
         let boundsMax = try container.decode(Float.self, forKey: .boundsMax)
@@ -137,7 +133,7 @@ extension TrackingMappingEntry.OutputKey: Codable {
     }
 
     public func encode(to encoder: any Encoder) throws {
-        var container = encoder.container(keyedBy: CodingKeys.self)
+        var container = encoder.container(keyedBy: RangeKeyCodingKeys.self)
         try container.encode(key, forKey: .key)
         try container.encode(bounds.lowerBound, forKey: .boundsMin)
         try container.encode(bounds.upperBound, forKey: .boundsMax)

app/xcode/Sources/VCamCamera/CameraExtension.swift

@@ -89,3 +89,5 @@ extension CameraExtension: OSSystemExtensionRequestDelegate {
         .replace
     }
 }
+
+extension OSSystemExtensionProperties: @retroactive @unchecked Sendable {}

app/xcode/Sources/VCamCamera/NSImage+.swift

@@ -30,7 +30,7 @@ public struct DisplayParameter: Codable, Identifiable, Equatable {
         public init() {}
     }
 
-    public struct Color: Codable, Equatable {
+    public struct Color: Codable, Equatable, Sendable {
         public var r: Float
         public var g: Float
         public var b: Float
@@ -77,6 +77,7 @@ private struct DisplayParameterPresetsFile: Codable {
     var parameters: [DisplayParameter]
 }
 
+@MainActor
 @Observable
 public final class DisplayParameterPresets {
     public static let shared = DisplayParameterPresets()
@@ -157,13 +158,7 @@ public final class DisplayParameterPresets {
 
 // MARK: - DisplayParameterPreset (for UI compatibility)
 
-public struct DisplayParameterPreset: CaseIterable, Hashable, Identifiable, CustomStringConvertible {
-    public static var allCases: [DisplayParameterPreset] {
-        DisplayParameterPresets.shared.parameters.map {
-            DisplayParameterPreset(id: $0.id, description: $0.name)
-        }
-    }
-
+public struct DisplayParameterPreset: Hashable, Identifiable, CustomStringConvertible, Sendable {
     public static let newPreset = Self.init(id: "", description: L10n.newPreset.text)
 
     public let id: String

app/xcode/Sources/VCamData/DisplayParameter.swift

@@ -10,6 +10,7 @@
 import Foundation
 import VCamBridge
 
+@MainActor
 public final class DisplayParameterController {
     private unowned let state: UniState
     private var storedParameterId = UserDefaults.standard.value(for: .displayParameterId)

app/xcode/Sources/VCamData/DisplayParameterController.swift

@@ -2,6 +2,7 @@ import AppKit
 import Observation
 import VCamEntity
 
+@MainActor
 @Observable
 public final class ModelManager {
     public static let shared = ModelManager()
@@ -17,7 +18,7 @@ public final class ModelManager {
 
     #if DEBUG
     public init(models: [Models.Model], lastLoadedModelId: UUID? = nil) {
-        self.modelItems = models.map { ModelItem(model: $0, status: .valid, thumbnail: $0.loadThumbnail()) }
+        self.modelItems = models.map { ModelItem(model: $0, status: .valid, thumbnail: $0.loadThumbnail()?.png) }
         self.lastLoadedModelId = lastLoadedModelId
     }
     #endif
@@ -62,7 +63,7 @@ public final class ModelManager {
         }.value
 
         if let image = metadata?.image {
-            saveThumbnail(image, for: model)
+            try? saveThumbnail(image, for: model)
         }
     }
 
@@ -100,14 +101,14 @@ public final class ModelManager {
     }
 
     public func setThumbnail(for item: ModelItem, from imageURL: URL) throws {
-        guard let image = NSImage(contentsOf: imageURL) else {
+        guard let image = NSImage(contentsOf: imageURL), let imageData = image.png else {
             throw ModelManagerError.invalidImage
         }
-        saveThumbnail(image, for: item.model)
-        updateThumbnail(for: item, image: image)
+        try saveThumbnail(imageData, for: item.model)
+        updateThumbnail(for: item, image: imageData)
     }
 
-    private func updateThumbnail(for item: ModelItem, image: NSImage) {
+    private func updateThumbnail(for item: ModelItem, image: Data) {
         guard let index = modelItems.firstIndex(where: { $0.id == item.id }) else { return }
         modelItems[index] = ModelItem(model: item.model, status: item.status, thumbnail: image)
     }
@@ -130,7 +131,7 @@ public final class ModelManager {
         modelItems = modelItems.map { item in
             let url = item.model.modelURL
             let status: ModelItem.ModelStatus = FileManager.default.fileExists(atPath: url.path) ? .valid : .missing
-            return ModelItem(model: item.model, status: status, thumbnail: item.thumbnail ?? item.model.loadThumbnail())
+            return ModelItem(model: item.model, status: status, thumbnail: item.thumbnail ?? item.model.loadThumbnail()?.png)
         }
         scanForNewModels()
         saveMeta()
@@ -158,7 +159,7 @@ public final class ModelManager {
                 let attributes = try? FileManager.default.attributesOfItem(atPath: modelFile.path)
                 let createdAt = attributes?[.creationDate] as? Date ?? .now
                 let modelInfo = Models.Model(name: name, type: Models.modelType, createdAt: createdAt)
-                modelItems.append(ModelItem(model: modelInfo, status: .valid, thumbnail: modelInfo.loadThumbnail()))
+                modelItems.append(ModelItem(model: modelInfo, status: .valid, thumbnail: modelInfo.loadThumbnail()?.png))
             }
         } catch {
             print("Failed to scan models: \(error)")
@@ -167,7 +168,7 @@ public final class ModelManager {
 
     @discardableResult
     private func addModel(_ model: Models.Model) -> ModelItem {
-        let item = ModelItem(model: model, status: .valid, thumbnail: model.loadThumbnail())
+        let item = ModelItem(model: model, status: .valid, thumbnail: model.loadThumbnail()?.png)
         guard !modelItems.contains(where: { $0.id == model.id }) else { return item }
         modelItems.insert(item, at: 0)
         saveMeta()
@@ -188,7 +189,7 @@ public final class ModelManager {
               let meta = try? JSONDecoder().decode(Models.self, from: data) else {
             return
         }
-        modelItems = meta.models.map { ModelItem(model: $0, status: .valid, thumbnail: $0.loadThumbnail()) }
+        modelItems = meta.models.map { ModelItem(model: $0, status: .valid, thumbnail: $0.loadThumbnail()?.png) }
         lastLoadedModelId = meta.lastModelId
     }
 
@@ -204,18 +205,8 @@ public final class ModelManager {
         }
     }
 
-    private func saveThumbnail(_ image: NSImage, for model: Models.Model) {
-        guard let tiffData = image.tiffRepresentation,
-              let bitmap = NSBitmapImageRep(data: tiffData),
-              let pngData = bitmap.representation(using: .png, properties: [:]) else {
-            return
-        }
-
-        do {
-            try pngData.write(to: model.rootURL.appending(path: Models.Model.thumbnailFileName))
-        } catch {
-            print("Failed to save thumbnail: \(error)")
-        }
+    private func saveThumbnail(_ image: Data, for model: Models.Model) throws {
+        try image.write(to: model.rootURL.appending(path: Models.Model.thumbnailFileName))
     }
 }