@regulaforensics/face-sdk 7.1.196-nightly → 7.1.201-nightly

package/examples/react-native/package.json

@@ -11,10 +11,10 @@
     "test": "jest"
   },
   "dependencies": {
-    "@regulaforensics/face-sdk": "7.1.196-nightly",
+    "@regulaforensics/face-sdk": "7.1.201-nightly",
     "@regulaforensics/face-core-basic": "7.1.114-nightly",
     "react": "18.3.1",
-    "react-native": "0.76.6",
+    "react-native": "0.76.9",
     "react-native-fs": "2.20.0",
     "react-native-image-picker": "7.2.3"
   },
@@ -25,10 +25,10 @@
     "@react-native-community/cli": "15.1.3",
     "@react-native-community/cli-platform-android": "15.1.3",
     "@react-native-community/cli-platform-ios": "15.1.3",
-    "@react-native/babel-preset": "0.76.6",
-    "@react-native/eslint-config": "0.76.6",
-    "@react-native/metro-config": "0.76.6",
-    "@react-native/typescript-config": "0.76.6",
+    "@react-native/babel-preset": "0.76.9",
+    "@react-native/eslint-config": "0.76.9",
+    "@react-native/metro-config": "0.76.9",
+    "@react-native/typescript-config": "0.76.9",
     "@types/react": "^18.2.6",
     "@types/react-test-renderer": "^18.0.0",
     "babel-jest": "^29.7.0",

package/examples/react-native/scripts/android.sh

@@ -3,6 +3,10 @@ set -e
 
 if [[ $npm_config_o || $npm_config_open ]]; then
     studio android || open -a 'Android Studio' android
+    # check if metro is already running
+    if ! pgrep -f "react-native start" > /dev/null; then
+        npm start
+    fi
 else
     react-native run-android
 fi

package/examples/react-native/scripts/ios.sh

@@ -3,6 +3,10 @@ set -e
 
 if [[ $npm_config_o || $npm_config_open ]]; then
     open ios/FaceSDK.xcworkspace
+    # check if metro is already running
+    if ! pgrep -f "react-native start" > /dev/null; then
+        npm start
+    fi
 else
     react-native run-ios
 fi

package/ios/RFSWJSONConstructor.m

@@ -311,7 +311,7 @@
 
 +(id)matchFacesImageFromJSON:(NSDictionary*)input {
     bool detectAll = false;
-    if (input[@"detectAll"]) detectAll = input[@"detectAll"];
+    if (input[@"detectAll"]) detectAll = [input[@"detectAll"] boolValue];
     RFSMatchFacesImage* result = [[RFSMatchFacesImage alloc] initWithImage:[self imageWithBase64:input[@"image"]]
                                                                  imageType:[input[@"imageType"] integerValue]
                                                                  detectAll:detectAll];
@@ -762,10 +762,9 @@
 
 +(id)generatePerson:(RFSPerson*)input {
     if (!input) return [NSNull null];
-    NSMutableDictionary* result = @{
-        @"updatedAt":[self generateDate:input.updatedAt],
-        @"createdAt":[self generateDate:input.createdAt]
-    }.mutableCopy;
+    NSMutableDictionary* result = @{}.mutableCopy;
+    if (input.updatedAt) result[@"updatedAt"] = [self generateDate:input.updatedAt];
+    if (input.createdAt) result[@"createdAt"] = [self generateDate:input.createdAt];
     if (input.name) result[@"name"] = input.name;
     if (input.groups) result[@"groups"] = input.groups;
     if (input.itemId) result[@"id"] = input.itemId;
@@ -807,9 +806,9 @@
 +(id)generatePersonImage:(RFSPersonImage*)input {
     if (!input) return [NSNull null];
     NSMutableDictionary* result = @{
-        @"url":[self generateUrl:input.url],
-        @"createdAt":[self generateDate:input.createdAt]
+        @"url":[self generateUrl:input.url]
     }.mutableCopy;
+    if (input.createdAt) result[@"createdAt"] = [self generateDate:input.createdAt];
     if (input.path) result[@"path"] = input.path;
     if (input.contentType) result[@"contentType"] = input.contentType;
     if (input.itemId) result[@"id"] = input.itemId;
@@ -843,9 +842,8 @@
 
 +(id)generatePersonGroup:(RFSPersonGroup*)input {
     if (!input) return [NSNull null];
-    NSMutableDictionary* result = @{
-        @"createdAt":[self generateDate:input.createdAt]
-    }.mutableCopy;
+    NSMutableDictionary* result = @{}.mutableCopy;
+    if (input.createdAt) result[@"createdAt"] = [self generateDate:input.createdAt];
     if (input.name) result[@"name"] = input.name;
     if (input.itemId) result[@"id"] = input.itemId;
     if (input.metadata) result[@"metadata"] = input.metadata;
@@ -876,7 +874,7 @@
                                                                           imageUpload:[self imageUploadFromJSON:input[@"imageUpload"]]];
     result.threshold = input[@"threshold"];
     result.limit = input[@"limit"];
-    if (input[@"detectAll"] && ![input[@"detectAll"] isEqual:[NSNull null]]) result.detectAll = input[@"detectAll"];
+    if (input[@"detectAll"] && ![input[@"detectAll"] isEqual:[NSNull null]]) result.detectAll = [input[@"detectAll"] boolValue];
     result.outputImageParams = [self outputImageParamsFromJSON:input[@"outputImageParams"]];
     return result;
 }
@@ -934,9 +932,9 @@
 
 +(id)generateSearchPersonImage:(RFSSearchPersonImage*)input {
     NSMutableDictionary* result = @{
-        @"url":[self generateUrl:input.url],
-        @"createdAt":[self generateDate:input.createdAt]
+        @"url":[self generateUrl:input.url]
     }.mutableCopy;
+    if (input.createdAt) result[@"createdAt"] = [self generateDate:input.createdAt];
     if (input.path) result[@"similarity"] = input.similarity;
     if (input.path) result[@"distance"] = input.distance;
     if (input.path) result[@"path"] = input.path;
@@ -964,9 +962,9 @@
     NSMutableDictionary* result = @{
         @"detection":[self generateSearchPersonDetection:input.detection],
         @"images":[self generateArray:input.images :@selector(generateSearchPersonImage:)],
-        @"updatedAt":[self generateDate:input.updatedAt],
-        @"createdAt":[self generateDate:input.createdAt]
     }.mutableCopy;
+    if (input.createdAt) result[@"createdAt"] = [self generateDate:input.createdAt];
+    if (input.updatedAt) result[@"updatedAt"] = [self generateDate:input.updatedAt];
     if (input.name) result[@"name"] = input.name;
     if (input.groups) result[@"groups"] = input.groups;
     if (input.itemId) result[@"id"] = input.itemId;

package/ios/RFSWMain.m

@@ -153,7 +153,7 @@ static UIViewController*(^rootViewController)(void) = ^UIViewController*(){
                                   completion:[self detectFacesCompletion:callback]];
 }
 
-+(void)createPerson:(NSString*)name :(NSDictionary*)metadata :(NSArray<NSString*>*)groupIds :(RFSWCallback)callback {
++(void)createPerson:(NSString*)name :(NSArray<NSString*>*)groupIds :(NSDictionary*)metadata :(RFSWCallback)callback {
     [RFSFaceSDK.service.personDatabase createPersonWithName:name
                                                    metadata:metadata
                                                    groupIds:groupIds

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@regulaforensics/face-sdk",
-  "version": "7.1.196-nightly",
+  "version": "7.1.201-nightly",
   "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="7.1.196-nightly" xmlns="http://apache.org/cordova/ns/plugins/1.0">
+<plugin id="@regulaforensics/face-sdk" version="7.1.201-nightly" xmlns="http://apache.org/cordova/ns/plugins/1.0">
   <name>FaceSDK</name>
   <description>Cordova plugin for Regula Face SDK</description>
   <license>commercial</license>
@@ -14,7 +14,7 @@
       <feature name="FaceSDK">
         <param name="ios-package" value="CVDFaceSDK" />
       </feature>
-      <preference name="deployment-target" value="12.0" />
+      <preference name="deployment-target" value="13.0" />
     </config-file>
     <header-file src="ios/CVDFaceSDK.h" />
     <source-file src="ios/CVDFaceSDK.m" />
@@ -26,7 +26,7 @@
     <source-file src="ios/RFSWConfig.m" />
     <podspec>
       <config>
-        <source url="https://cdn.cocoapods.org/" />
+        <source url="https://github.com/CocoaPods/Specs.git" />
       </config>
       <pods>
         <pod name="FaceSDKNightly" spec="7.1.2555" />

package/www/capacitor/detect_faces/detect_faces_request.js

@@ -1,3 +1,5 @@
+import { DetectFacesScenario } from './detect_faces_scenario'
+
 export class DetectFacesRequest {
     image
     configuration

package/www/capacitor/image_quality/image_quality_characteristic.js

@@ -1,3 +1,5 @@
+import { ImageQualityRange } from './image_quality_range'
+
 export class ImageQualityCharacteristic {
     characteristicName
     recommendedRange

package/www/capacitor/image_quality/image_quality_group.js

@@ -1,3 +1,4 @@
+import { ImageQualityCharacteristicName } from './image_quality_characteristic_name'
 import { ImageQualityCharacteristic } from './image_quality_characteristic'
 import { ImageQualityRange } from './image_quality_range'
 

package/www/capacitor/internal/bridge.js

@@ -8,10 +8,11 @@ export async function exec(name, params) {
     return RNFaceSDK.exec(name, params)
 }
 
-function _setEvent(id, completion) {
+function _setEvent(id, completion, fromJson) {
     eventManager.removeAllListeners(id)
-    if (completion != null)
-        eventManager.addListener(id, completion)
+    // if no fromJson provided, just call completion
+    if (fromJson == undefined) fromJson = func => func
+    if (completion != undefined) eventManager.addListener(id, fromJson(completion))
 }
 
 export function _setCustomButtonTappedCompletion(completion) {
@@ -19,18 +20,18 @@ export function _setCustomButtonTappedCompletion(completion) {
 }
 
 export function _setVideoEncoderCompletion(completion) {
-    _setEvent("video_encoder_completion", (json) => {
+    _setEvent("video_encoder_completion", completion, func => json => {
         var jsonObject = JSON.parse(json)
         var transactionId = jsonObject["transactionId"]
         var success = jsonObject["success"]
-        completion(transactionId, success)
+        func(transactionId, success)
     })
 }
 
 export function _setLivenessNotificationCompletion(completion) {
-    _setEvent("livenessNotificationEvent", (json) => {
+    _setEvent("livenessNotificationEvent", completion, func => json => {
         var livenessNotification = LivenessNotification.fromJson(JSON.parse(json))
-        completion(livenessNotification)
+        func(livenessNotification)
     })
 }
 

package/www/capacitor/person_database/person_database.js

@@ -38,7 +38,7 @@ export class PersonDatabase {
 
     async getPersonImage(personId, imageId) {
         var response = await exec("getPersonImage", [personId, imageId])
-        return this._itemResponseFromJson(response, PersonImage.fromJson)
+        return this._itemResponseFromJson(response, data => data)
     }
 
     async getPersonImages(personId) {