@regulaforensics/face-sdk 8.4.1349-rc → 8.4.1352-beta

package/RNFaceSDK.podspec

@@ -5,7 +5,7 @@ source = File.join(__dir__, 'ios')
 
 Pod::Spec.new do |s|
   s.name         = 'RNFaceSDK'
-  s.version      = '8.4.1349-rc'
+  s.version      = '8.4.1352-beta'
   s.summary      = package['description']
   s.license      = package['license']
 
@@ -16,6 +16,6 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '13.0'
   s.source_files = [ 'ios/**/*.swift', 'ios/**/RN*.m' ]
   s.exclude_files = [ 'ios/CDVFaceSDK.swift' ]
-  s.dependency 'FaceSDKStage', '8.4.4892'
+  s.dependency 'FaceSDKBeta', '8.4.4895'
   s.dependency 'React'
 end

package/android/build.gradle

@@ -20,7 +20,7 @@ android {
 rootProject.allprojects {
     repositories {
         maven {
-            url "https://maven.regulaforensics.com/RegulaDocumentReader/Stage"
+            url "https://maven.regulaforensics.com/RegulaDocumentReader/Beta"
         }
     }
 }
@@ -29,7 +29,7 @@ dependencies {
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+'
     //noinspection GradleDependency
-    implementation('com.regula.face:api:8.4.5355'){
+    implementation('com.regula.face:api:8.4.5358'){
         transitive = true
     }
 }

package/android/cordova.gradle

@@ -6,13 +6,13 @@ android {
 
 repositories {
     maven {
-        url "https://maven.regulaforensics.com/RegulaDocumentReader/Stage"
+        url "https://maven.regulaforensics.com/RegulaDocumentReader/Beta"
     }
 }
 
 dependencies {
     //noinspection GradleDependency
-    implementation('com.regula.face:api:8.4.5355'){
+    implementation('com.regula.face:api:8.4.5358'){
         transitive = true
     }
 }

package/examples/capacitor/package.json

@@ -6,8 +6,8 @@
     "android": "scripts/android.sh"
   },
   "dependencies": {
-    "@regulaforensics/face-sdk": "8.4.1349-rc",
-    "@regulaforensics/face-core-basic": "8.4.822-rc",
+    "@regulaforensics/face-sdk": "8.4.1352-beta",
+    "@regulaforensics/face-core-basic": "8.3.683",
     "@awesome-cordova-plugins/file": "^8.1.0",
     "@awesome-cordova-plugins/camera": "^8.1.0",
     "cordova-plugin-file": "^8.1.3",

package/examples/ionic/package.json

@@ -20,8 +20,8 @@
     "@awesome-cordova-plugins/camera": "^9.2.0",
     "@awesome-cordova-plugins/dialogs": "^9.2.0",
     "@awesome-cordova-plugins/file": "^9.2.0",
-    "@regulaforensics/face-sdk": "8.4.1349-rc",
-    "@regulaforensics/face-core-basic": "8.4.822-rc",
+    "@regulaforensics/face-sdk": "8.4.1352-beta",
+    "@regulaforensics/face-core-basic": "8.3.683",
     "cordova-android": "^15.0.0",
     "cordova-ios": "^8.1.1",
     "cordova-plugin-camera": "^8.0.0",

package/examples/react_native/package.json

@@ -8,8 +8,8 @@
     "start": "expo start"
   },
   "dependencies": {
-    "@regulaforensics/face-sdk": "8.4.1349-rc",
-    "@regulaforensics/face-core-basic": "8.4.822-rc",
+    "@regulaforensics/face-sdk": "8.4.1352-beta",
+    "@regulaforensics/face-core-basic": "8.3.683",
     "react-native": "^0.81.4",
     "react-native-fs": "^2.20.0",
     "react-native-image-picker": "^8.2.1",

package/ios/CDVFaceSDK.swift

@@ -33,10 +33,22 @@ func sendEvent(_ event: String, _ data: Any? = "") {
     this!.commandDelegate.send(result!, callbackId: callbackId)
 }
 
-let rootViewController: () -> UIViewController? = {
-    return UIApplication.shared.connectedScenes
-        .compactMap { $0 as? UIWindowScene }
-        .flatMap { $0.windows }
-        .first { $0.isKeyWindow }?
-        .rootViewController
+func runAsync (_ action: @escaping (UIViewController) -> Void) {
+    DispatchQueue.main.async {
+        for case let scene as UIWindowScene in UIApplication.shared.connectedScenes
+            where scene.activationState == .foregroundActive || scene.activationState == .foregroundInactive {
+            let window = scene.windows.first { $0.isKeyWindow } ?? scene.windows.first { !$0.isHidden && $0.alpha > 0 && $0.windowLevel == .normal }
+            guard var presenter = window?.rootViewController else { continue }
+            while let next = presenter.presentedViewController
+                ?? (presenter as? UINavigationController)?.visibleViewController
+                ?? (presenter as? UINavigationController)?.topViewController
+                ?? (presenter as? UITabBarController)?.selectedViewController {
+                presenter = next
+            }
+            guard presenter.viewIfLoaded?.window != nil else { continue }
+            action(presenter)
+            return
+        }
+        print("REGULA: Cannot present the UI: no presenter available.")
+    }
 }

package/ios/Implementation.swift

@@ -39,26 +39,26 @@ func methodCall(_ method: String, _ callback: @escaping Callback) {
         })
     case("deinitialize"): face.deinitialize()
     case("startFaceCapture"): let config = FaceCaptureConfiguration.decode(argsNullable(0))
-        DispatchQueue.main.async {
+        runAsync { presenter in
             face.presentFaceCaptureViewController(
-                from: rootViewController()!,
+                from: presenter,
                 animated: true,
                 configuration: config,
                 onCapture: { callback($0.encode()) })
         }
     case("stopFaceCapture"): face.stopFaceCaptureViewController()
     case("startLiveness"): let config = LivenessConfiguration.decode(argsNullable(0))
-        DispatchQueue.main.async {
+        runAsync { presenter in
             face.startLiveness(
-                from: rootViewController()!,
+                from: presenter,
                 animated: true,
                 configuration: config,
                 onLiveness: { callback($0.encode()) })
         }
     case("startEnrollment"): let config = EnrollmentConfiguration.decode2(args(0))
-        DispatchQueue.main.async {
+        runAsync { presenter in
             face.startEnrollment(
-                from: rootViewController()!,
+                from: presenter,
                 animated: true,
                 configuration: config,
                 onEnrollment: { callback([
@@ -67,9 +67,9 @@ func methodCall(_ method: String, _ callback: @escaping Callback) {
                 ]) })
         }
     case("startVerification"): let config = VerificationConfiguration.decode2(args(0))
-        DispatchQueue.main.async {
+        runAsync { presenter in
             face.startVerification(
-                from: rootViewController()!,
+                from: presenter,
                 animated: true,
                 configuration: config,
                 onVerification: { callback([

package/ios/RNFaceSDK.swift

@@ -34,9 +34,15 @@ private var this: RNFaceSDK?
 
 func sendEvent(_ event: String, _ data: Any? = nil) {
     guard let plugin = this, hasListeners else { return }
+    runAsync { _ in plugin.sendEvent(withName: event, body: data.toSendable()) }
+}
+
+func runAsync(_ action: @escaping (UIViewController) -> Void) {
     DispatchQueue.main.async {
-        plugin.sendEvent(withName: event, body: data.toSendable())
+        if let presenter = RCTPresentedViewController() {
+            action(presenter)
+            return
+        }
+        print("REGULA: Cannot present Face SDK UI: no presenter available.")
     }
 }
-
-let rootViewController: () -> UIViewController? = { return RCTPresentedViewController() }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@regulaforensics/face-sdk",
-  "version": "8.4.1349-rc",
+  "version": "8.4.1352-beta",
   "description": "This is an npm module for Regula Face SDK. It allows you to easily compaire faces using your phone's camera.",
   "main": "www/react-native/index.js",
   "module": "www/capacitor/index.js",

package/plugin.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="@regulaforensics/face-sdk" version="8.4.1349-rc" xmlns="http://apache.org/cordova/ns/plugins/1.0">
+<plugin id="@regulaforensics/face-sdk" version="8.4.1352-beta" xmlns="http://apache.org/cordova/ns/plugins/1.0">
   <name>FaceSDK</name>
   <description>Cordova plugin for Regula Face SDK</description>
   <license>commercial</license>
@@ -27,7 +27,7 @@
         <source url="https://github.com/regulaforensics/podspecs.git" />
       </config>
       <pods>
-        <pod name="FaceSDKStage" spec="8.4.4892" />
+        <pod name="FaceSDKBeta" spec="8.4.4895" />
       </pods>
     </podspec>
   </platform>

package/test/package-lock.json

@@ -13,7 +13,7 @@
     },
     "..": {
       "name": "@regulaforensics/face-sdk",
-      "version": "8.4.1349-rc",
+      "version": "8.4.1352-beta",
       "dev": true,
       "license": "commercial",
       "dependencies": {