upgrade liveness

Author: Victor

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 1.4.2 (2025-07-17)
+
+## 1.4.1 (2025-07-01)
+
+## 1.4.0 (2025-06-30)
+
+### Features
+
+- add no-light/facemovementonly challenge and back camera support  (#131)
+
 ## 1.3.5 (2025-03-18)
 
 ## 1.3.4 (2025-01-13)

Package.swift

@@ -13,7 +13,7 @@ let package = Package(
             targets: ["FaceLiveness"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/aws-amplify/amplify-swift", exact: "2.45.4")
+        .package(url: "https://github.com/aws-amplify/amplify-swift", exact: "2.49.0")
     ],
     targets: [
         .target(

Sources/FaceLiveness/FaceDetection/BlazeFace/DetectedFace.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+@_spi(PredictionsFaceLiveness) import AWSPredictionsPlugin
 
 struct DetectedFace {
     var boundingBox: CGRect
@@ -19,7 +20,8 @@ struct DetectedFace {
 
     let confidence: Float
 
-    func boundingBoxFromLandmarks(ovalRect: CGRect) -> CGRect {
+    func boundingBoxFromLandmarks(ovalRect: CGRect,
+                                  ovalMatchChallenge: FaceLivenessSession.OvalMatchChallenge) -> CGRect {
         let alpha = 2.0
         let gamma = 1.8
         let ow = (alpha * pupilDistance + gamma * faceHeight) / 2
@@ -34,7 +36,7 @@ struct DetectedFace {
         }
 
         let faceWidth = ow
-        let faceHeight = 1.618 * faceWidth
+        let faceHeight = ovalMatchChallenge.oval.heightWidthRatio * faceWidth
         let faceBoxBottom = boundingBox.maxY
         let faceBoxTop = faceBoxBottom - faceHeight
         let faceBoxLeft = min(cx - ow / 2, rightEar.x)

Sources/FaceLiveness/FaceDetection/BlazeFace/FaceDetectorShortRange+Model.swift

@@ -12,6 +12,7 @@ import Accelerate
 import CoreGraphics
 import CoreImage
 import VideoToolbox
+@_spi(PredictionsFaceLiveness) import AWSPredictionsPlugin
 
 enum FaceDetectorShortRange {}
 
@@ -33,11 +34,16 @@ extension FaceDetectorShortRange {
             )
         }
 
+        weak var faceDetectionSessionConfiguration: FaceDetectionSessionConfigurationWrapper?
         weak var detectionResultHandler: FaceDetectionResultHandler?
 
         func setResultHandler(detectionResultHandler: FaceDetectionResultHandler) {
             self.detectionResultHandler = detectionResultHandler
         }
+        
+        func setFaceDetectionSessionConfigurationWrapper(configuration: FaceDetectionSessionConfigurationWrapper) {
+            self.faceDetectionSessionConfiguration = configuration
+        }
 
         func detectFaces(from buffer: CVPixelBuffer) {
             let faces = prediction(for: buffer)
@@ -105,10 +111,22 @@ extension FaceDetectorShortRange {
                     count: confidenceScoresCapacity
                 )
             )
+            
+            let blazeFaceDetectionThreshold: Float
+            if let sessionConfiguration = faceDetectionSessionConfiguration?.sessionConfiguration {
+                switch sessionConfiguration {
+                case .faceMovement(let ovalMatchChallenge):
+                    blazeFaceDetectionThreshold = Float(ovalMatchChallenge.faceDetectionThreshold)
+                case .faceMovementAndLight(_, let ovalMatchChallenge):
+                    blazeFaceDetectionThreshold = Float(ovalMatchChallenge.faceDetectionThreshold)
+                }
+            } else {
+                blazeFaceDetectionThreshold = confidenceScoreThreshold
+            }
 
             var passingConfidenceScoresIndices = confidenceScores
                 .enumerated()
-                .filter { $0.element >= confidenceScoreThreshold }
+                .filter { $0.element >= blazeFaceDetectionThreshold}
                 .sorted(by: {
                     $0.element > $1.element
                 })

Sources/FaceLiveness/FaceDetection/FaceDetector.swift

@@ -6,6 +6,7 @@
 //
 
 import AVFoundation
+@_spi(PredictionsFaceLiveness) import AWSPredictionsPlugin
 
 protocol FaceDetector {
     func detectFaces(from buffer: CVPixelBuffer)
@@ -16,6 +17,10 @@ protocol FaceDetectionResultHandler: AnyObject {
     func process(newResult: FaceDetectionResult)
 }
 
+protocol FaceDetectionSessionConfigurationWrapper: AnyObject {
+    var sessionConfiguration: FaceLivenessSession.SessionConfiguration? { get }
+}
+
 enum FaceDetectionResult {
     case noFace
     case singleFace(DetectedFace)

Sources/FaceLiveness/Utilities/FinalClientEvent+Init.swift

@@ -17,8 +17,14 @@ extension FinalClientEvent {
         faceMatchedEnd: UInt64,
         videoEnd: UInt64
     ) {
-        let normalizedBoundingBox = sessionConfiguration
-            .ovalMatchChallenge
+        let ovalMatchChallenge: FaceLivenessSession.OvalMatchChallenge
+        switch sessionConfiguration {
+        case .faceMovement(let challenge):
+            ovalMatchChallenge = challenge
+        case .faceMovementAndLight(_, let challenge):
+            ovalMatchChallenge = challenge
+        }
+        let normalizedBoundingBox = ovalMatchChallenge
             .oval.boundingBox
             .normalize(within: videoSize)
 

Sources/FaceLiveness/Utilities/UserAgent.swift

@@ -10,7 +10,7 @@ import InternalAmplifyCredentials
 
 struct UserAgentValues {
 
-    static let libVersion = "1.3.4"
+    static let libVersion = "1.4.2"
     static let libName = "amplify-ui-swift-face-liveness"
 
     let amplifyVersion: String

Sources/FaceLiveness/Views/CameraPermission/CameraPermissionView.swift

@@ -17,7 +17,7 @@ struct CameraPermissionView: View {
     }
 
     var body: some View {
-        VStack(alignment: .leading) {
+        VStack(alignment: .center) {
             Spacer()
             VStack {
                 Text(LocalizedStrings.camera_permission_change_setting_header)

Sources/FaceLiveness/Views/GetReadyPage/CameraPreviewView.swift

@@ -15,7 +15,7 @@ struct CameraPreviewView: View {
 
     @StateObject var model: CameraPreviewViewModel
 
-    init(model: CameraPreviewViewModel = CameraPreviewViewModel()) {
+    init(model: CameraPreviewViewModel = CameraPreviewViewModel(cameraPosition: .front)) {
         self._model = StateObject(wrappedValue: model)
     }
 

Sources/FaceLiveness/Views/GetReadyPage/CameraPreviewViewModel.swift

@@ -16,15 +16,18 @@ class CameraPreviewViewModel: NSObject, ObservableObject {
     @Published var buffer: CVPixelBuffer?
 
     var previewCaptureSession: LivenessCaptureSession?
+    let cameraPosition: LivenessCamera
 
-    override init() {
+    init(cameraPosition: LivenessCamera) {
+        self.cameraPosition = cameraPosition
+        
         super.init()
         setupSubscriptions()
 
         let avCaptureDevice = AVCaptureDevice.DiscoverySession(
             deviceTypes: [.builtInWideAngleCamera],
             mediaType: .video,
-            position: .front
+            position: cameraPosition == .front ? .front : .back
         ).devices.first
 
         let outputDelegate = CameraPreviewOutputSampleBufferDelegate { [weak self] buffer in