@regulaforensics/face-sdk 6.5.67-beta → 6.5.84-beta

package/RNFaceSDK.podspec

@@ -5,7 +5,7 @@ source = File.join(__dir__, 'ios')
 
 Pod::Spec.new do |s|
   s.name         = 'RNFaceSDK'
-  s.version      = '6.5.67-beta'
+  s.version      = '6.5.84-beta'
   s.summary      = package['description']
   s.license      = package['license']
 
@@ -16,6 +16,6 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '12.0'
   s.source_files = 'ios/**/*.{h,m}'
   s.exclude_files = [ 'ios/CVDFaceSDK.h', 'ios/CVDFaceSDK.m' ]
-  s.dependency 'FaceSDK', '6.4.2321'
+  s.dependency 'FaceSDKBeta', '6.2.1930'
   s.dependency 'React'
 end

package/android/build.gradle

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

package/android/cordova.gradle

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

package/examples/capacitor/README.md

@@ -3,13 +3,13 @@
 ## How to build demo application
 1. Download or the clone current repository using the command `git clone https://github.com/regulaforensics/npm-face-sdk.git`.
 
-2. Run `npm run setup` within this directory.
+2. Execute `npm run setup` within this directory.
 
 3. Run the app: 
-  * Android: use command `ionic cap run android`.
-  * IOS: use command `ionic cap run ios`.
+  * IOS: `npm run ios`.
+  * Android: `npm run android`.
 
-**Note**: this is just one way of running the app. You can also run it directly from Xcode and Android Studio, but in this case make sure to run `ionic cap sync` before building if any changes were make to the project.
+**Note**: this is just one way of running the app. You can also pass `-o` or `--open` argument to the command, and this will open Xcode/Android Studio, then run the app directly from the IDE. Overall, this is a more consistent way, so if you're having troubles running the app from terminal, try running it from the IDE.
 
 
 ## How to use offine match

package/examples/capacitor/package.json

@@ -4,9 +4,9 @@
   "version": "1.0.0",
   "type": "module",
   "scripts": {
-    "setup": "npm install",
-    "android": "ionic cap run android --open",
-    "ios": "ionic cap run ios --open",
+    "setup": "scripts/setup.sh",
+    "ios": "scripts/ios.sh",
+    "android": "scripts/android.sh",
     "dev": "vite",
     "build": "tsc && vite build",
     "preview": "vite preview",
@@ -15,8 +15,8 @@
     "lint": "eslint"
   },
   "dependencies": {
-    "@regulaforensics/face-sdk": "6.5.67-beta",
-    "@regulaforensics/face-core-basic": "6.3.12-beta",
+    "@regulaforensics/face-sdk": "6.5.84-beta",
+    "@regulaforensics/face-core-basic": "6.3.146-beta",
     "@awesome-cordova-plugins/camera": "6.6.0",
     "@awesome-cordova-plugins/file": "6.6.0",
     "@awesome-cordova-plugins/dialogs": "6.6.0",

package/examples/capacitor/scripts/android.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+set -e
+
+if [[ $npm_config_o || $npm_config_open ]]; then
+    ionic cap sync android
+    studio android || open -a 'Android Studio' android
+else
+    ionic cap run android
+fi

package/examples/capacitor/scripts/ios.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -e
+
+if [[ $npm_config_o || $npm_config_open ]]; then
+    ionic cap run ios --open
+else
+    ionic cap run ios
+fi

package/examples/capacitor/scripts/setup.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+set -e
+
+npm install

package/examples/cordova/README.md

@@ -3,13 +3,13 @@
 ## How to build demo application
 1. Download or the clone current repository using the command `git clone https://github.com/regulaforensics/npm-face-sdk.git`.
 
-2. Run `npm run setup` within this directory.
+2. Execute `npm run setup` within this directory.
 
 3. Run the app: 
-  * Android: use command `npm run android`.
-  * IOS: use command `npm run ios`.
+  * IOS: `npm run ios`.
+  * Android: `npm run android`.
 
-**Note**: this is just one way of running the app. You can also run it directly from Xcode and Android Studio, but in this case make sure to run `cordova prepare ios` and `cordova prepare android` before building if any changes were make to the project.
+**Note**: this is just one way of running the app. You can also pass `-o` or `--open` argument to the command, and this will open Xcode/Android Studio, then run the app directly from the IDE. Overall, this is a more consistent way, so if you're having troubles running the app from terminal, try running it from the IDE.
 
 
 ## How to use offine match

package/examples/cordova/package.json

@@ -4,18 +4,13 @@
   "version": "1.0.0",
   "main": "index.js",
   "scripts": {
-    "setup": "npm install && cordova prepare",
-    "android": "cordova run android",
-    "ios": "cordova run ios"
+    "setup": "scripts/setup.sh",
+    "ios": "scripts/ios.sh",
+    "android": "scripts/android.sh"
   },
-  "keywords": [
-    "ecosystem:cordova"
-  ],
-  "author": "Regula Forensics Inc.",
-  "license": "commercial",
   "dependencies": {
-    "@regulaforensics/face-sdk": "6.5.67-beta",
-    "@regulaforensics/face-core-basic": "6.3.12-beta",
+    "@regulaforensics/face-sdk": "6.5.84-beta",
+    "@regulaforensics/face-core-basic": "6.3.146-beta",
     "cordova-android": "13.0.0",
     "cordova-ios": "7.1.1",
     "cordova-plugin-add-swift-support": "2.0.2",
@@ -36,4 +31,4 @@
       "ios"
     ]
   }
-}
+}

package/examples/cordova/scripts/android.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+if [[ $npm_config_o || $npm_config_open ]]; then
+    cordova prepare android
+    studio platforms/android || open -a 'Android Studio' platforms/android
+else
+    cordova run android
+fi

package/examples/cordova/scripts/ios.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+if [[ $npm_config_o || $npm_config_open ]]; then
+    cordova prepare ios
+    open platforms/ios/FaceSDK.xcworkspace
+else
+    cordova run ios
+fi

package/examples/cordova/scripts/setup.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+set -e
+
+npm install
+cordova prepare

package/examples/ionic/README.md

@@ -3,13 +3,13 @@
 ## How to build demo application
 1. Download or the clone current repository using the command `git clone https://github.com/regulaforensics/npm-face-sdk.git`.
 
-2. Run `npm run setup` within this directory.
+2. Execute `npm run setup` within this directory.
 
 3. Run the app: 
-  * Android: use command `npm run android`.
-  * IOS: use command `npm run ios`.
+  * IOS: `npm run ios`.
+  * Android: `npm run android`.
 
-**Note**: this is just one way of running the app. You can also run it directly from Xcode and Android Studio, but in this case make sure to run `ionic cordova prepare ios` and `ionic cordova prepare android` before building if any changes were make to the project.
+**Note**: this is just one way of running the app. You can also pass `-o` or `--open` argument to the command, and this will open Xcode/Android Studio, then run the app directly from the IDE. Overall, this is a more consistent way, so if you're having troubles running the app from terminal, try running it from the IDE.
 
 
 ## How to use offine match

package/examples/ionic/package.json

@@ -4,9 +4,9 @@
   "author": "Ionic Framework",
   "homepage": "https://ionicframework.com/",
   "scripts": {
-    "setup": "npm install && ionic cordova prepare",
-    "android": "ionic cordova run android",
-    "ios": "ionic cordova run ios",
+    "setup": "scripts/setup.sh",
+    "ios": "scripts/ios.sh",
+    "android": "scripts/android.sh",
     "ng": "ng",
     "start": "ng serve",
     "build": "ng build",
@@ -16,8 +16,8 @@
   },
   "private": true,
   "dependencies": {
-    "@regulaforensics/face-sdk": "6.5.67-beta",
-    "@regulaforensics/face-core-basic": "6.3.12-beta",
+    "@regulaforensics/face-sdk": "6.5.84-beta",
+    "@regulaforensics/face-core-basic": "6.3.146-beta",
     "cordova-plugin-camera": "8.0.0",
     "@awesome-cordova-plugins/camera": "6.14.0",
     "@awesome-cordova-plugins/core": "6.14.0",

package/examples/ionic/scripts/android.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+if [[ $npm_config_o || $npm_config_open ]]; then
+    ionic cordova prepare android
+    studio platforms/android || open -a 'Android Studio' platforms/android
+else
+    ionic cordova run android
+fi

package/examples/ionic/scripts/ios.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+if [[ $npm_config_o || $npm_config_open ]]; then
+    ionic cordova prepare ios
+    open platforms/ios/FaceSDK.xcworkspace
+else
+    ionic cordova run ios
+fi

package/examples/ionic/scripts/setup.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+set -e
+
+npm install
+ionic cordova prepare

package/examples/ionic/src/app/home/home.page.ts

@@ -3,7 +3,7 @@ import { Dialogs } from '@awesome-cordova-plugins/dialogs/ngx'
 import { File } from '@awesome-cordova-plugins/file'
 import { Camera, DestinationType, MediaType, PictureSourceType } from '@awesome-cordova-plugins/camera/ngx'
 import { Platform } from '@ionic/angular'
-import { FaceSDK, InitConfig, LivenessSkipStep, LivenessStatus, LivenessConfig } from '@regulaforensics/face-sdk'
+import { FaceSDK, MatchFacesRequest, MatchFacesImage, InitConfig, LivenessSkipStep, ImageType, LivenessStatus, LivenessConfig } from '@regulaforensics/face-sdk'
 
 async function init() {
   if (!await initialize()) return
@@ -20,14 +20,33 @@ async function startLiveness() {
     }
   })
   if (response.image == null) return
-  setImage(response.image, 1)
+  setImage(response.image, ImageType.LIVE, 1)
   setLivenessStatus(response.liveness == LivenessStatus.PASSED ? "passed" : "unknown")
 }
 
+async function matchFaces() {
+  if (image1 == null || image2 == null) {
+    setStatus("Both images required!")
+    return
+  }
+  setStatus("Processing...")
+  var request = new MatchFacesRequest([image1, image2])
+  var response = await faceSdk.matchFaces(request)
+  var split = await faceSdk.splitComparedFaces(response.results, 0.75)
+  var match = split.matchedFaces
+  setSimilarityStatus("failed")
+  if (match.length > 0)
+    setSimilarityStatus((match[0].similarity * 100).toFixed(2) + "%")
+  setStatus("Ready")
+}
+
 function clearResults() {
   setStatus("Ready")
+  setSimilarityStatus("null")
   setLivenessStatus("null")
   resetImages()
+  image1 = null
+  image2 = null
 }
 
 // If 'regula.license' exists, init using license(enables offline match)
@@ -45,14 +64,40 @@ async function initialize() {
   return success
 }
 
-function setImage(base64: string, position: number) {
+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)
+  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)
+}
+
+function useGallery(position: number) {
+  app.camera.getPicture({
+    destinationType: DestinationType.DATA_URL,
+    mediaType: MediaType.PICTURE,
+    sourceType: PictureSourceType.PHOTOLIBRARY
+  }).then((result: string) => setImage(result, ImageType.PRINTED, position))
+}
+
+function pickImage(position: number) {
+  app.dialogs.confirm("", "Select option", ["Use gallery", "Use camera"]).then(button => {
+    if (button == 1) useGallery(position)
+    else useCamera(position)
+  })
 }
 
 async function loadAssetIfExists(path: string): Promise<string | null> {
@@ -73,7 +118,10 @@ async function loadAssetIfExists(path: string): Promise<string | null> {
 }
 
 var app: HomePage
-var faceSdk = new FaceSDK()
+var faceSdk = FaceSDK.instance
+
+var image1: MatchFacesImage | null
+var image2: MatchFacesImage | null
 
 var setStatus = (data: string) => app.status.nativeElement.innerHTML = data
 var setSimilarityStatus = (data: string) => app.similarityResult.nativeElement.innerHTML = data
@@ -106,6 +154,9 @@ export class HomePage {
   async ionViewDidEnter() {
     app = this
 
+    app.img1.nativeElement.onclick = () => pickImage(1)
+    app.img2.nativeElement.onclick = () => pickImage(2)
+    app.matchFacesButton.nativeElement.addEventListener("click", matchFaces)
     app.livenessButton.nativeElement.addEventListener("click", startLiveness)
     app.clearResultsButton.nativeElement.addEventListener("click", clearResults)
 

package/examples/react-native/README.md

@@ -3,13 +3,13 @@
 ## How to build demo application
 1. Download or the clone current repository using the command `git clone https://github.com/regulaforensics/npm-face-sdk.git`.
 
-2. Run `npm run setup` within this directory.
+2. Execute `npm run setup` within this directory.
 
 3. Run the app: 
-  * Android: use command `npm run android`.
-  * IOS: use command `npm run ios`.
+  * IOS: `npm run ios`.
+  * Android: `npm run android`.
 
-**Note**: this is just one way of running the app. You can also run it directly from Xcode and Android Studio, but in this case make sure that Metro Bundler is running(`npm start`).
+**Note**: this is just one way of running the app. You can also pass `-o` or `--open` argument to the command, and this will open Xcode/Android Studio, then run the app directly from the IDE. Overall, this is a more consistent way, so if you're having troubles running the app from terminal, try running it from the IDE. Just don't forget to make sure that Metro Bundler is running(`npm start`).
 
 
 ## How to use offine match