@regulaforensics/face-sdk 7.2.414-beta → 7.2.421-beta

package/examples/react_native/package.json

@@ -8,19 +8,19 @@
     "start": "expo start"
   },
   "dependencies": {
-    "@regulaforensics/face-sdk": "7.2.414-beta",
-    "@regulaforensics/face-core-basic": "7.1.240-nightly",
-    "react-native": "0.79.5",
+    "@regulaforensics/face-sdk": "7.2.421-beta",
+    "@regulaforensics/face-core-basic": "7.1.202",
+    "react-native": "0.79.2",
     "react-native-fs": "2.20.0",
     "react-native-image-picker": "8.2.1",
-    "react-native-webview": "13.15.0",
-    "@react-native/metro-config": "0.79.5",
+    "react-native-webview": "13.13.5",
+    "@react-native/metro-config": "0.79.2",
     "react": "19.1.0",
-    "@types/react": "19.1.8",
-    "expo": "53.0.20",
-    "expo-dev-client": "5.2.4",
+    "@types/react": "19.1.4",
+    "expo": "53.0.9",
+    "expo-dev-client": "5.1.8",
     "expo-custom-assets": "1.4.1",
-    "expo-build-properties": "0.14.8",
+    "expo-build-properties": "0.14.6",
     "typescript": "5.8.3"
   }
 }

package/examples/react_native/src/main.css

@@ -1,19 +1,15 @@
 html,
 body {
-    margin: 0;
-    width: 100%;
+    width: 99%;
     height: 99vh;
     display: flex;
-    overflow: hidden;
     flex-direction: column;
 }
 
-/* Prevent text selection */
-* {
-    user-select: none !important;
-    -webkit-user-select: none !important;
-    -webkit-user-drag: none !important;
-    -webkit-touch-callout: none !important;
+.page {
+    height: 100%;
+    display: flex;
+    flex-direction: column;
 }
 
 .column {
@@ -56,14 +52,10 @@ body {
     margin-top: 13px;
 }
 
-.scroll {
-    flex-grow: 1;
-    overflow-y: auto;
-}
-
 .no-scroll {
     flex-grow: 1;
     overflow-y: hidden;
+    overflow-x: hidden;
 }
 
 .button {
@@ -75,7 +67,6 @@ body {
     color: white;
     border: none;
     padding: 10px 20px;
-    justify-content: center;
     font-size: 16px;
     border-radius: 100px;
     cursor: pointer;
@@ -89,49 +80,4 @@ body {
 .button:active {
     position: relative;
     top: 1px;
-}
-
-.text-button {
-    background: none;
-    border: none;
-    color: #2196f3;
-    font-size: 20px;
-    font-weight: bold;
-    padding: 5px;
-}
-
-.text-button:active {
-    position: relative;
-    top: 1px;
-}
-
-.radio {
-    align-items: baseline;
-    padding: 15px;
-}
-
-input[type="checkbox"] {
-    width: 20px;
-    height: 20px;
-    border: 2px solid black;
-    background-color: white;
-    display: inline-block;
-    position: relative;
-    cursor: pointer;
-}
-
-.progress-bar {
-    width: 75%;
-    padding: 3px;
-    margin-top: 40px;
-    background-color: #eee;
-    border-radius: 8px;
-    box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
-}
-
-#progress {
-    width: 0%;
-    height: 20px;
-    background-color: #4285F4;
-    border-radius: 5px;
 }

package/examples/react_native/src/main.html

@@ -1,4 +1,4 @@
-<div class="column" style="height: 100%">
+<div class="page">
     <div class="column header">
         <span id="status">Loading...</span>
         <div class="column divider"></div>

package/examples/react_native/src/main.tsx

@@ -1,19 +1,13 @@
+import { document } from '../index'
+import * as RNFS from 'react-native-fs'
+import { Alert, Platform } from 'react-native'
+import { launchImageLibrary } from 'react-native-image-picker'
 import { FaceSDK, MatchFacesRequest, MatchFacesImage, InitConfig, LivenessSkipStep, ImageType, LivenessStatus, LivenessConfig } from '@regulaforensics/face-sdk'
-import { loadAssetIfExists, chooseOption, pickImage } from '../index'
-
-var faceSdk = FaceSDK.instance
-var image1: MatchFacesImage | null
-var image2: MatchFacesImage | null
 
 async function init() {
-  if (!await initializeReader()) return
+  if (!await initialize()) return
   setStatus("Ready")
-}
-
-async function startFaceCapture(position: number) {
-  var image = (await faceSdk.startFaceCapture()).image
-  if (image == null) return
-  setImage("data:image/png;base64," + image.image, image.imageType, position)
+  FaceSDK.instance.serviceUrl = 'http://localhost:41101/'
 }
 
 async function startLiveness() {
@@ -25,8 +19,9 @@ async function startLiveness() {
       console.log("LivenessStatus: " + notification.status)
     }
   })
+  console.log("response", { ...response, image: null })
   if (response.image == null) return
-  setImage("data:image/png;base64," + response.image, ImageType.LIVE, 1)
+  setImage(response.image, ImageType.LIVE, 1)
   setLivenessStatus(response.liveness == LivenessStatus.PASSED ? "passed" : "unknown")
 }
 
@@ -46,34 +41,18 @@ async function matchFaces() {
   setStatus("Ready")
 }
 
-async function getImage(position: number) {
-  var source = await chooseOption()
-  if (source == null) return
-  if (source) startFaceCapture(position)
-  else {
-    var image = await pickImage()
-    if (image == null) return
-    setImage(image, ImageType.PRINTED, position)
-  }
-}
-
-function setImage(base64: string, type: number, position: number) {
+function clearResults() {
+  setStatus("Ready")
   setSimilarityStatus("null")
-  var mfImage = new MatchFacesImage(base64, type)
-  if (position == 1) {
-    image1 = mfImage
-    setUiImage1(base64)
-    setLivenessStatus("null")
-  }
-  if (position == 2) {
-    image2 = mfImage
-    setUiImage2(base64)
-  }
+  setLivenessStatus("null")
+  resetImages()
+  image1 = null
+  image2 = null
 }
 
 // If 'regula.license' exists, init using license(enables offline match)
 // otherwise init without license.
-async function initializeReader() {
+async function initialize() {
   setStatus("Initializing...")
 
   var license = await loadAssetIfExists("regula.license")
@@ -81,36 +60,82 @@ async function initializeReader() {
   if (license != null) config = new InitConfig(license)
   var [success, error] = await faceSdk.initialize({ config: config })
 
-  if (error != null) {
+  if (!success && error != null) {
     setStatus(error.message)
     console.log(error.code + ": " + error.message)
   }
   return success
 }
 
-// --------------------------------------------------------------------------------------------------------------------
+function setImage(base64: string, type: number, position: number) {
+  setSimilarityStatus("null")
+  var mfImage = new MatchFacesImage(base64, type)
+  if (position == 1) {
+    image1 = mfImage
+    setUiImage1("data:image/png;base64," + base64)
+    setLivenessStatus("null")
+  }
+  if (position == 2) {
+    image2 = mfImage
+    setUiImage2("data:image/png;base64," + base64)
+  }
+}
+
+async function useCamera(position: number) {
+  var response = await faceSdk.startFaceCapture()
+  if (response.image == null) return
+  var image = response.image
+  setImage(image.image, image.imageType, position)
+}
 
-export function main() {
-  document.getElementById("first-image")!.onclick = () => getImage(1)
-  document.getElementById("second-image")!.onclick = () => getImage(2)
-  document.getElementById("match-faces")!.onclick = () => matchFaces()
-  document.getElementById("start-liveness")!.onclick = () => startLiveness()
-  document.getElementById("clear-results")!.onclick = () => clearResults()
+function useGallery(position: number) {
+  launchImageLibrary({
+    mediaType: 'photo',
+    selectionLimit: 1,
+    includeBase64: true
+  }, (response: any) => {
+    if (response.assets == null) return
+    setImage(response.assets[0].base64!, ImageType.PRINTED, position)
+  })
+}
 
-  init()
+function pickImage(position: number) {
+  Alert.alert("Select option", "", [
+    { text: "Use gallery", onPress: () => useGallery(position) },
+    { text: "Use camera", onPress: () => useCamera(position) }
+  ], { cancelable: true })
+}
+
+async function loadAssetIfExists(path: string): Promise<string | null> {
+  if (Platform.OS === 'ios') path = RNFS.MainBundlePath + "/" + path
+  var readFile = Platform.OS === 'ios' ? RNFS.readFile : RNFS.readFileRes
+  try {
+    return await readFile(path, 'base64')
+  } catch {
+    return null
+  }
 }
 
-var setStatus = (data: string) => document.getElementById("status")!.innerHTML = data
-var setLivenessStatus = (data: string) => document.getElementById("liveness-status")!.innerHTML = data
-var setSimilarityStatus = (data: string) => document.getElementById("similarity-status")!.innerHTML = data
+var faceSdk = FaceSDK.instance
+var image1: MatchFacesImage | null
+var image2: MatchFacesImage | null
+
+var setStatus = (data: string) => document.getElementById("status").innerHTML = data
+var setLivenessStatus = (data: string) => document.getElementById("liveness-status").innerHTML = data
+var setSimilarityStatus = (data: string) => document.getElementById("similarity-status").innerHTML = data
 var setUiImage1 = (data: string) => (document.getElementById("first-image") as HTMLImageElement).src = data
 var setUiImage2 = (data: string) => (document.getElementById("second-image") as HTMLImageElement).src = data
-var clearResults = () => {
-  setStatus("Ready")
-  setSimilarityStatus("null")
-  setLivenessStatus("null")
+var resetImages = () => {
   setUiImage1("images/portrait.png")
   setUiImage2("images/portrait.png")
-  image1 = null
-  image2 = null
+}
+
+export function onload() {
+  document.getElementById("first-image").onclick = () => pickImage(1)
+  document.getElementById("second-image").onclick = () => pickImage(2)
+  document.getElementById("match-faces").onclick = () => matchFaces()
+  document.getElementById("start-liveness").onclick = () => startLiveness()
+  document.getElementById("clear-results").onclick = () => clearResults()
+
+  init()
 }

package/ios/RFSWJSONConstructor.h

@@ -52,6 +52,7 @@
 +(RFSImageQualityCharacteristic* _Nonnull)imageQualityCharacteristicFromJSON:(id _Nonnull)input;
 +(NSDictionary<NSString*, id>* _Nonnull)generateImageQualityCharacteristic:(RFSImageQualityCharacteristic* _Nonnull)input;
 
++(RFSFaceSDKVersion* _Nonnull)faceSDKVersionFromJSON:(id _Nonnull)input;
 +(NSDictionary<NSString*, id>* _Nonnull)generateFaceSDKVersion:(RFSFaceSDKVersion* _Nonnull)input;
 
 +(RFSInitializationConfiguration* _Nonnull)initConfigFromJSON:(id _Nonnull)input;

package/ios/RFSWJSONConstructor.m

@@ -203,7 +203,17 @@
     return result;
 }
 
-// No fromJSON and no tests for FaceSDKVersion because of its implementation.
++(id)faceSDKVersionFromJSON:(NSDictionary*)input {
+    if (!input || [input isEqual:[NSNull null]])  return nil;
+    RFSFaceSDKVersion* result = [RFSFaceSDKVersion new];
+    
+    [result setValue:input[@"api"] forKey:@"api"];
+    [result setValue:input[@"core"] forKey:@"core"];
+    [result setValue:input[@"coreMode"] forKey:@"coreMode"];
+    
+    return result;
+}
+
 +(id)generateFaceSDKVersion:(RFSFaceSDKVersion*)input {
     if (!input) return [NSNull null];
     NSMutableDictionary* result = @{}.mutableCopy;
@@ -281,9 +291,9 @@
 
 +(id)livenessResponseFromJSON:(NSDictionary*)input {
     RFSLivenessResponse* result = [RFSLivenessResponse alloc];
-    SEL sel = NSSelectorFromString(@"initWithTag:transactionId:estimatedAge:status:image:error:");
+    SEL sel = NSSelectorFromString(@"initWithTag:transactionId:estimatedAge:status:normalImage:scaledImage:error:");
     IMP imp = [result methodForSelector:sel];
-    void (*func)(id, SEL, id, id, id, NSInteger, id, id) = (void *)imp;
+    void (*func)(id, SEL, id, id, id, NSInteger, id, id, id) = (void *)imp;
     func(result,
          sel,
          input[@"tag"],
@@ -291,6 +301,7 @@
          input[@"estimatedAge"],
          [input[@"liveness"] integerValue],
          [self imageWithBase64:input[@"image"]],
+         [self imageWithBase64:input[@"image"]],
          nil);
     return result;
 }
@@ -882,7 +893,6 @@
                                                                           imageUpload:[self imageUploadFromJSON:input[@"imageUpload"]]];
     result.threshold = input[@"threshold"];
     result.limit = input[@"limit"];
-    result.tag = input[@"tag"];
     if (input[@"detectAll"] && ![input[@"detectAll"] isEqual:[NSNull null]]) result.detectAll = [input[@"detectAll"] boolValue];
     result.outputImageParams = [self outputImageParamsFromJSON:input[@"outputImageParams"]];
     return result;
@@ -896,7 +906,6 @@
     }.mutableCopy;
     if (input.threshold) result[@"threshold"] = input.threshold;
     if (input.limit) result[@"limit"] = input.limit;
-    if (input.tag) result[@"tag"] = input.tag;
     if (input.groupIdsForSearch) result[@"groupIdsForSearch"] = input.groupIdsForSearch;
     if (input.outputImageParams) result[@"outputImageParams"] = [self generateOutputImageParams:input.outputImageParams];
     return result;

package/ios/RFSWMain.m

@@ -9,12 +9,6 @@
         @"getVersion": ^{ [self getVersion :callback]; },
         @"getServiceUrl": ^{ [self getServiceUrl :callback]; },
         @"setServiceUrl": ^{ [self setServiceUrl :args[0] :callback]; },
-        @"getTenant": ^{ [self getTenant :callback]; },
-        @"setTenant": ^{ [self setTenant :args[0]]; },
-        @"getEnv": ^{ [self getEnv :callback]; },
-        @"setEnv": ^{ [self setEnv :args[0]]; },
-        @"getLocale": ^{ [self getLocale :callback]; },
-        @"setLocale": ^{ [self setLocale :args[0]]; },
         @"setLocalizationDictionary": ^{ [self setLocalizationDictionary :args[0]]; },
         @"setRequestHeaders": ^{ [self setRequestHeaders :args[0]]; },
         @"setCustomization": ^{ [self setCustomization :args[0]]; },
@@ -70,30 +64,6 @@ static NSDictionary* headers;
     callback(@"");
 }
 
-+(void)getTenant:(RFSWCallback)callback {
-    callback([RFSFaceSDK.service tenant]);
-}
-
-+(void)setTenant:(NSString*)tag {
-    [RFSFaceSDK.service setTenant:tag];
-}
-
-+(void)getEnv:(RFSWCallback)callback {
-    callback([RFSFaceSDK.service env]);
-}
-
-+(void)setEnv:(NSString*)tag {
-    [RFSFaceSDK.service setEnv:tag];
-}
-
-+(void)getLocale:(RFSWCallback)callback {
-    callback([RFSFaceSDK.service languageLocaleCode]);
-}
-
-+(void)setLocale:(NSString*)locale {
-    [RFSFaceSDK.service setLanguageLocaleCode:locale];
-}
-
 +(void)setLocalizationDictionary:(NSDictionary*)dictionary {
     RFSFaceSDK.service.localizationHandler = ^NSString* (NSString* localizationKey) {
         if (dictionary[localizationKey]) return dictionary[localizationKey];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@regulaforensics/face-sdk",
-  "version": "7.2.414-beta",
+  "version": "7.2.421-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="7.2.414-beta" xmlns="http://apache.org/cordova/ns/plugins/1.0">
+<plugin id="@regulaforensics/face-sdk" version="7.2.421-beta" xmlns="http://apache.org/cordova/ns/plugins/1.0">
   <name>FaceSDK</name>
   <description>Cordova plugin for Regula Face SDK</description>
   <license>commercial</license>
@@ -29,7 +29,7 @@
         <source url="https://github.com/CocoaPods/Specs.git" />
       </config>
       <pods>
-        <pod name="FaceSDKNightly" spec="7.1.3008" />
+        <pod name="FaceSDK" spec="7.1.2940" />
       </pods>
     </podspec>
   </platform>

package/www/capacitor/customization/customization_fonts.js

@@ -101,6 +101,6 @@ export class CustomizationFonts {
     }
 
     _apply() {
-        this._set(this.toJson())
+        this._set(toJson())
     }
 }

package/www/capacitor/customization/customization_images.js

@@ -124,6 +124,6 @@ export class CustomizationImages {
     }
 
     _apply() {
-        this._set(this.toJson())
+        this._set(toJson())
     }
 }

package/www/capacitor/customization/font.js

@@ -19,14 +19,6 @@ export class Font {
 
         return result
     }
-
-    toJson() {
-        return {
-            "name": this.name,
-            "size": this.size,
-            "style": this.style,
-        }
-    }
 }
 
 export const FontStyle = {

package/www/capacitor/detect_faces/detect_face_result.js

@@ -35,16 +35,4 @@ export class DetectFaceResult {
 
         return result
     }
-
-    toJson() {
-        return {
-            "quality": this.quality?.map(e => e.toJson()),
-            "crop": this.crop,
-            "attributes": this.attributes?.map(e => e.toJson()),
-            "landmarks": this.landmarks?.map(e => e.toJson()),
-            "faceRect": this.faceRect?.toJson(),
-            "originalRect": this.originalRect?.toJson(),
-            "isQualityCompliant": this.isQualityCompliant,
-        }
-    }
 }

package/www/capacitor/detect_faces/detect_faces_attribute_result.js

@@ -17,13 +17,4 @@ export class DetectFacesAttributeResult {
 
         return result
     }
-
-    toJson() {
-        return {
-            "attribute": this.attribute,
-            "value": this.value,
-            "range": this.range?.toJson(),
-            "confidence": this.confidence,
-        }
-    }
 }

package/www/capacitor/detect_faces/detect_faces_backend_exception.js

@@ -11,13 +11,6 @@ export class DetectFacesBackendException {
 
         return result
     }
-
-    toJson() {
-        return {
-            "code": this.code,
-            "message": this.message,
-        }
-    }
 }
 
 export const DetectFacesBackendErrorCode = {

package/www/capacitor/detect_faces/detect_faces_config.js

@@ -1,6 +1,3 @@
-import { ImageQualityCharacteristic } from '../image_quality/image_quality_characteristic'
-import { OutputImageParams } from '../image_params/output_image_params'
-
 export class DetectFacesConfig {
     attributes
     customQuality
@@ -14,35 +11,4 @@ export class DetectFacesConfig {
         this.outputImageParams = params?.outputImageParams
         this.onlyCentralFace = params?.onlyCentralFace ?? this.onlyCentralFace
     }
-
-    static fromJson(jsonObject) {
-        if (jsonObject == null) return null
-        const result = new DetectFacesConfig()
-
-        if (jsonObject["attributes"] != null) {
-            result.attributes = []
-            for (const item of jsonObject["attributes"]) {
-                result.attributes.push(item)
-            }
-        }
-        if (jsonObject["customQuality"] != null) {
-            result.customQuality = []
-            for (const item of jsonObject["customQuality"]) {
-                result.customQuality.push(ImageQualityCharacteristic.fromJson(item))
-            }
-        }
-        result.outputImageParams = OutputImageParams.fromJson(jsonObject["outputImageParams"])
-        result.onlyCentralFace = jsonObject["onlyCentralFace"]
-
-        return result
-    }
-
-    toJson() {
-        return {
-            "attributes": this.attributes?.map(e => e),
-            "customQuality": this.customQuality?.map(e => e.toJson()),
-            "outputImageParams": this.outputImageParams?.toJson(),
-            "onlyCentralFace": this.onlyCentralFace,
-        }
-    }
 }

package/www/capacitor/detect_faces/detect_faces_exception.js

@@ -15,14 +15,6 @@ export class DetectFacesException {
 
         return result
     }
-
-    toJson() {
-        return {
-            "code": this.code,
-            "message": this.message,
-            "underlyingError": this.underlyingError?.toJson(),
-        }
-    }
 }
 
 export const DetectFacesErrorCode = {

package/www/capacitor/detect_faces/detect_faces_request.js

@@ -1,5 +1,4 @@
 import { DetectFacesScenario } from './detect_faces_scenario'
-import { DetectFacesConfig } from './detect_faces_config'
 
 export class DetectFacesRequest {
     image
@@ -67,25 +66,4 @@ export class DetectFacesRequest {
         result.scenario = DetectFacesScenario.ATTRIBUTES_ALL
         return result
     }
-
-    static fromJson(jsonObject) {
-        if (jsonObject == null) return null
-        const result = new DetectFacesRequest()
-
-        result.tag = jsonObject["tag"]
-        result.scenario = jsonObject["scenario"]
-        result.image = jsonObject["image"]
-        result.configuration = DetectFacesConfig.fromJson(jsonObject["configuration"])
-
-        return result
-    }
-
-    toJson() {
-        return {
-            "tag": this.tag,
-            "scenario": this.scenario,
-            "image": this.image,
-            "configuration": this.configuration?.toJson(),
-        }
-    }
 }

package/www/capacitor/detect_faces/detect_faces_response.js

@@ -21,13 +21,4 @@ export class DetectFacesResponse {
 
         return result
     }
-
-    toJson() {
-        return {
-            "detection": this.detection?.toJson(),
-            "allDetections": this.allDetections?.map(e => e.toJson()),
-            "scenario": this.scenario,
-            "error": this.error?.toJson(),
-        }
-    }
 }

package/www/capacitor/face_capture/face_capture_config.js

@@ -29,41 +29,4 @@ export class FaceCaptureConfig {
         this.timeout = params?.timeout
         this.holdStillDuration = params?.holdStillDuration
     }
-
-    static fromJson(jsonObject) {
-        if (jsonObject == null) return null
-        const result = new FaceCaptureConfig()
-
-        result.copyright = jsonObject["copyright"]
-        result.cameraSwitchEnabled = jsonObject["cameraSwitchEnabled"]
-        result.closeButtonEnabled = jsonObject["closeButtonEnabled"]
-        result.torchButtonEnabled = jsonObject["torchButtonEnabled"]
-        result.vibrateOnSteps = jsonObject["vibrateOnSteps"]
-        result.detectOcclusion = jsonObject["detectOcclusion"]
-        result.showFaceAnimation = jsonObject["showFaceAnimation"]
-        result.cameraPositionAndroid = jsonObject["cameraPositionAndroid"]
-        result.cameraPositionIOS = jsonObject["cameraPositionIOS"]
-        result.screenOrientation = jsonObject["screenOrientation"]
-        result.timeout = jsonObject["timeout"]
-        result.holdStillDuration = jsonObject["holdStillDuration"]
-
-        return result
-    }
-
-    toJson() {
-        return {
-            "copyright": this.copyright,
-            "cameraSwitchEnabled": this.cameraSwitchEnabled,
-            "closeButtonEnabled": this.closeButtonEnabled,
-            "torchButtonEnabled": this.torchButtonEnabled,
-            "vibrateOnSteps": this.vibrateOnSteps,
-            "detectOcclusion": this.detectOcclusion,
-            "showFaceAnimation": this.showFaceAnimation,
-            "cameraPositionAndroid": this.cameraPositionAndroid,
-            "cameraPositionIOS": this.cameraPositionIOS,
-            "screenOrientation": this.screenOrientation,
-            "timeout": this.timeout,
-            "holdStillDuration": this.holdStillDuration,
-        }
-    }
 }