@regulaforensics/document-reader 9.4.717-rc → 9.4.720-nightly

package/examples/ionic/package.json

@@ -18,7 +18,7 @@
     "@ionic/cordova-builders": "^12.3.0",
     "@awesome-cordova-plugins/camera": "^8.1.0",
     "@awesome-cordova-plugins/file": "^8.1.0",
-    "@regulaforensics/document-reader": "9.4.717-rc",
+    "@regulaforensics/document-reader": "9.4.720-nightly",
     "@regulaforensics/document-reader-core-fullauthrfid": "9.3.1817",
     "@regulaforensics/document-reader-btdevice": "9.1.35",
     "cordova-android": "^14.0.1",
@@ -31,7 +31,8 @@
     "ajv": "^8.18.0",
     "serialize-javascript": "^7.0.4",
     "@angular/compiler": "^21.2.4",
-    "undici": "^7.24.0"
+    "undici": "^7.24.0",
+    "picomatch": "^4.0.4"
   },
   "cordova": {
     "plugins": {

package/examples/react_native/package-lock.json

@@ -3036,9 +3036,9 @@
       }
     },
     "node_modules/@xmldom/xmldom": {
-      "version": "0.8.11",
-      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.11.tgz",
-      "integrity": "sha512-cQzWCtO6C8TQiYl1ruKNn2U6Ao4o4WBBcbL61yJl84x+j5sOWWFU9X7DpND8XZG3daDppSsigMdfAIl2upQBRw==",
+      "version": "0.8.12",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.12.tgz",
+      "integrity": "sha512-9k/gHF6n/pAi/9tqr3m3aqkuiNosYTurLLUtc7xQ9sxB/wm7WPygCv8GYa6mS0fLJEHhqMC1ATYhz++U/lRHqg==",
       "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
@@ -3183,9 +3183,9 @@
       }
     },
     "node_modules/anymatch/node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz",
+      "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==",
       "license": "MIT",
       "engines": {
         "node": ">=8.6"
@@ -3527,9 +3527,9 @@
       }
     },
     "node_modules/brace-expansion": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.3.tgz",
+      "integrity": "sha512-MCV/fYJEbqx68aE58kv2cA/kiky1G8vux3OR6/jbS+jIMe/6fJWa0DTzJU7dqijOWYwHi1t29FlfYI9uytqlpA==",
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
@@ -4734,9 +4734,9 @@
       }
     },
     "node_modules/glob/node_modules/brace-expansion": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
+      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
@@ -5168,9 +5168,9 @@
       }
     },
     "node_modules/jest-util/node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz",
+      "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==",
       "license": "MIT",
       "engines": {
         "node": ">=8.6"
@@ -6426,9 +6426,9 @@
       }
     },
     "node_modules/micromatch/node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz",
+      "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==",
       "license": "MIT",
       "engines": {
         "node": ">=8.6"
@@ -6596,9 +6596,9 @@
       "license": "MIT"
     },
     "node_modules/node-forge": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.2.tgz",
-      "integrity": "sha512-6xKiQ+cph9KImrRh0VsjH2d8/GXA4FIMlgU4B757iI1ApvcyA9VlouP0yZJha01V+huImO+kKMU7ih+2+E14fw==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.4.0.tgz",
+      "integrity": "sha512-LarFH0+6VfriEhqMMcLX2F7SwSXeWwnEAJEsYm5QKWchiVYVvJyV9v7UDvUv+w5HO23ZpQTXDv/GxdDdMyOuoQ==",
       "license": "(BSD-3-Clause OR GPL-2.0)",
       "engines": {
         "node": ">= 6.13.0"
@@ -6953,9 +6953,9 @@
       "license": "ISC"
     },
     "node_modules/picomatch": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-3.0.1.tgz",
-      "integrity": "sha512-I3EurrIQMlRc9IaAZnqRR044Phh2DXY+55o7uJ0V+hYZAcQYSuFWsc9q5PvyDHUSCe1Qxn/iBz+78s86zWnGag==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-3.0.2.tgz",
+      "integrity": "sha512-cfDHL6LStTEKlNilboNtobT/kEa30PtAf2Q1OgszfrG/rpVl1xaFWT9ktfkS306GmHgmnad1Sw4wabhlvFtsTw==",
       "license": "MIT",
       "engines": {
         "node": ">=10"
@@ -8204,9 +8204,9 @@
       }
     },
     "node_modules/test-exclude/node_modules/brace-expansion": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
+      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
@@ -8706,15 +8706,18 @@
       "license": "ISC"
     },
     "node_modules/yaml": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.1.tgz",
-      "integrity": "sha512-lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw==",
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.3.tgz",
+      "integrity": "sha512-AvbaCLOO2Otw/lW5bmh9d/WEdcDFdQp2Z2ZUH3pX9U2ihyUY0nvLv7J6TrWowklRGPYbB/IuIMfYgxaCPg5Bpg==",
       "license": "ISC",
       "bin": {
         "yaml": "bin.mjs"
       },
       "engines": {
         "node": ">= 14.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/eemeli"
       }
     },
     "node_modules/yargs": {

package/examples/react_native/package.json

@@ -8,7 +8,7 @@
     "start": "expo start"
   },
   "dependencies": {
-    "@regulaforensics/document-reader": "9.4.717-rc",
+    "@regulaforensics/document-reader": "9.4.720-nightly",
     "@regulaforensics/document-reader-core-fullauthrfid": "9.3.1817",
     "@regulaforensics/document-reader-btdevice": "9.1.35",
     "react-native": "^0.81.4",

package/ios/RGLWJSONConstructor.h

@@ -198,6 +198,10 @@
 +(NSDictionary* _Nullable)generateDocumentRequestMDL:(RGLDocumentRequestMDL* _Nullable)input;
 +(RGLFinalizeConfig* _Nullable)finalizeConfigFromJson:(NSDictionary* _Nullable)input;
 +(NSDictionary* _Nullable)generateFinalizeConfig:(RGLFinalizeConfig* _Nullable)input;
++(RGLRFIDAccessControlPACE* _Nullable)paceProtocolFromJson:(NSDictionary* _Nullable)input;
++(NSDictionary* _Nullable)generatePaceProtocol:(RGLRFIDAccessControlPACE* _Nullable)input;
++(RGLRFIDAccessControlCA* _Nullable)caProtocolFromJson:(NSDictionary* _Nullable)input;
++(NSDictionary* _Nullable)generateCaProtocol:(RGLRFIDAccessControlCA* _Nullable)input;
 
 @end
 

package/ios/RGLWJSONConstructor.m

@@ -61,22 +61,22 @@ static NSMutableArray* weakReferencesHolder;
 +(NSDictionary*)generateError:(NSError*)input {
     if(input == nil) return nil;
     NSMutableDictionary *result = [NSMutableDictionary new];
-
+    
     result[@"code"] = [NSNumber numberWithInteger:input.code];
     result[@"message"] = input.localizedDescription;
-
+    
     return result;
 }
 
 +(NSString*)generateCompletion:(NSNumber*)action :(RGLDocumentReaderResults*)results :(NSError*)error {
     NSMutableDictionary *result = [NSMutableDictionary new];
     int actionInt = [action intValue];
-
+    
     if(actionInt == 0 || actionInt == 2 || actionInt == 3 || actionInt == 4 || actionInt == 6)
         result[@"results"] = [self generateDocumentReaderResults:results];
     result[@"action"] = action;
     result[@"error"] = [self generateError:error];
-
+    
     return [RGLWJSONConstructor dictToString: result];
 }
 
@@ -100,11 +100,11 @@ static NSMutableArray* weakReferencesHolder;
 
 +(NSString*)generateFinalizePackageCompletion:(NSNumber*)action :(RGLTransactionInfo*)info :(NSError*)error {
     NSMutableDictionary *result = [NSMutableDictionary new];
-
+    
     result[@"action"] = action;
     result[@"info"] = [self generateTransactionInfo:info];
     result[@"error"] = [self generateError:error];
-
+    
     return [RGLWJSONConstructor dictToString: result];
 }
 
@@ -158,12 +158,12 @@ static NSMutableArray* weakReferencesHolder;
     if (!input) return nil;
     if (!input[@"license"]) return nil;
     RGLConfig *config = [[RGLConfig alloc] initWithLicenseData:[self base64Decode: input[@"license"]]];
-
+    
     if (input[@"databasePath"]) config.databasePath = input[@"databasePath"];
     if (input[@"licenseUpdateTimeout"]) config.licenseUpdateTimeout = input[@"licenseUpdateTimeout"];
     if (input[@"licenseUpdate"]) config.licenseUpdateCheck = [input[@"licenseUpdate"] boolValue];
     if (input[@"delayedNNLoad"]) config.delayedNNLoadEnabled = [input[@"delayedNNLoad"] boolValue];
-
+    
     return config;
 }
 
@@ -176,19 +176,19 @@ static NSMutableArray* weakReferencesHolder;
     result[@"licenseUpdateTimeout"] = input.licenseUpdateTimeout;
     result[@"licenseUpdate"] = @(input.licenseUpdateCheck);
     result[@"delayedNNLoad"] = @(input.delayedNNLoadEnabled);
-
+    
     return result;
 }
 
 +(RGLBleConfig*)bleDeviceConfigFromJson:(NSDictionary*)input :(RGLBluetooth*)bluetooth {
     if (!input) return nil;
     RGLBleConfig *config = [[RGLBleConfig alloc] initWithBluetooth:bluetooth];
-
+    
     if (input[@"databasePath"]) config.databasePath = input[@"databasePath"];
     if (input[@"licenseUpdateTimeout"]) config.licenseUpdateTimeout = input[@"licenseUpdateTimeout"];
     if (input[@"licenseUpdate"]) config.licenseUpdateCheck = [input[@"licenseUpdate"] boolValue];
     if (input[@"delayedNNLoad"]) config.delayedNNLoadEnabled = [input[@"delayedNNLoad"] boolValue];
-
+    
     return config;
 }
 
@@ -223,7 +223,7 @@ static NSMutableArray* weakReferencesHolder;
     RGLRecognizeConfig *config = [RGLRecognizeConfig alloc];
     if (input[@"scenario"]) config = [config initWithScenario:input[@"scenario"]];
     else config = [config initWithOnlineProcessingConfig:[self onlineProcessingConfigFromJson:input[@"onlineProcessingConfig"]]];
-
+    
     if (input[@"image"]) config.image = [RGLWJSONConstructor imageWithBase64:input[@"image"]];
     if (input[@"data"]) config.imageData = [RGLWJSONConstructor base64Decode:input[@"data"]];
     if (input[@"images"]) {
@@ -238,13 +238,13 @@ static NSMutableArray* weakReferencesHolder;
             [imageInputs addObject:[RGLWJSONConstructor imageInputFromJson: imageInput]];
         config.imageInputs = imageInputs;
     }
-
+    
     if (input[@"scenario"]) config.scenario = input[@"scenario"];
     if (input[@"livePortrait"]) config.livePortrait = [self imageWithBase64:input[@"livePortrait"]];
     if (input[@"extPortrait"]) config.extPortrait = [self imageWithBase64:input[@"extPortrait"]];
     if (input[@"oneShotIdentification"]) config.oneShotIdentification = input[@"oneShotIdentification"];
     if (input[@"dtc"]) config.dtc = [RGLWJSONConstructor base64Decode:input[@"dtc"]];
-
+    
     return config;
 }
 
@@ -533,10 +533,10 @@ static NSMutableArray* weakReferencesHolder;
 
 +(RGLRFIDParams*)rfidParamsFromJson:(NSDictionary*)input {
     RGLRFIDParams* result = [RGLRFIDParams new];
-
+    
     if([input valueForKey:@"paIgnoreNotificationCodes"] != nil)
         result.paIgnoreNotificationCodes = [input valueForKey:@"paIgnoreNotificationCodes"];
-
+    
     return result;
 }
 
@@ -561,7 +561,7 @@ static NSMutableArray* weakReferencesHolder;
 
 +(RGLFaceAPIParams*)faceAPIParamsFromJson:(NSDictionary*)input {
     RGLFaceAPIParams* result = [RGLFaceAPIParams defaultParams];
-
+    
     if([input valueForKey:@"url"] != nil)
         result.url = [input valueForKey:@"url"];
     if([input valueForKey:@"mode"] != nil)
@@ -578,7 +578,7 @@ static NSMutableArray* weakReferencesHolder;
         result.proxyPassword = [input valueForKey:@"proxyPassword"];
     if([input valueForKey:@"proxyType"] != nil)
         result.proxyType = [input valueForKey:@"proxyType"];
-
+    
     return result;
 }
 
@@ -600,14 +600,14 @@ static NSMutableArray* weakReferencesHolder;
 
 +(RGLFaceAPISearchParams*)faceAPISearchParamsFromJson:(NSDictionary*)input {
     RGLFaceAPISearchParams* result = [RGLFaceAPISearchParams new];
-
+    
     if([input valueForKey:@"limit"] != nil)
         result.limit = [input valueForKey:@"limit"];
     if([input valueForKey:@"threshold"] != nil)
         result.threshold = [input valueForKey:@"threshold"];
     if([input valueForKey:@"groupIds"] != nil)
         result.groupIDs = [input valueForKey:@"groupIds"];
-
+    
     return result;
 }
 
@@ -1055,7 +1055,7 @@ static NSMutableArray* weakReferencesHolder;
     result[@"notificationCode"] = @(input.code & -0x10000);
     result[@"dataFileType"] = @((int)input.attachment);
     result[@"progress"] = @((int)input.value);
-
+    
     return [RGLWJSONConstructor dictToString: result];
 }
 
@@ -1714,10 +1714,10 @@ static NSMutableArray* weakReferencesHolder;
 +(NSDictionary*)generateDataField:(RGLDataField*)input {
     NSMutableDictionary *result = [NSMutableDictionary new];
     if(input == nil) return nil;
-
+    
     result[@"data"] = input.data;
     result[@"fieldType"] = @(input.fieldType);
-
+    
     return result;
 }
 
@@ -1835,7 +1835,7 @@ static NSMutableArray* weakReferencesHolder;
     for(NSDictionary* item in [input valueForKey:@"checks"])
         [array addObject:[self authenticityCheckFromJson:item]];
     RGLDocumentReaderAuthenticityResult* result = [[RGLDocumentReaderAuthenticityResult alloc]
-     initWithAuthenticityChecks:array];
+                                                   initWithAuthenticityChecks:array];
     if (input[@"status"]) [result setValue:input[@"status"] forKey:@"_security"];
     return result;
 }
@@ -2434,7 +2434,7 @@ static NSMutableArray* weakReferencesHolder;
     for (NSString* key in map) {
         [result addField:key intentToRetain:[map[key] integerValue]];
     }
-
+    
     return result;
     
 }
@@ -2459,7 +2459,7 @@ static NSMutableArray* weakReferencesHolder;
         [nameSpaces addObject:[self nameSpaceMDLFromJson: item]];
     }
     [result setValue:nameSpaces forKey:@"nameSpaces"];
-
+    
     return result;
     
 }
@@ -2632,7 +2632,7 @@ static NSMutableArray* weakReferencesHolder;
     if (input[@"video"]) result.video = [input[@"video"] boolValue];
     if (input[@"rfidSession"]) result.rfidSession = [input[@"rfidSession"] boolValue];
     if (input[@"mdlSession"]) result.mdlSession = [input[@"mdlSession"] boolValue];
-
+    
     return result;
 }
 
@@ -2648,6 +2648,52 @@ static NSMutableArray* weakReferencesHolder;
     return result;
 }
 
++(RGLRFIDAccessControlPACE*)paceProtocolFromJson:(NSDictionary*)input {
+    NSMutableDictionary* json = input.mutableCopy;
+    
+    json[@"Version"] = input[@"version"];
+    json[@"StdDomainParams"] = input[@"stdDomainParams"];
+    json[@"KeyAlgorithm"] = input[@"keyAlgorithm"];
+#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
+    return [[RGLRFIDAccessControlPACE alloc] performSelector:NSSelectorFromString(@"initWithJSON:") withObject:json];
+#pragma clang diagnostic pop
+}
+
++(NSDictionary*)generatePaceProtocol:(RGLRFIDAccessControlPACE*)input {
+    if(input == nil) return nil;
+    NSMutableDictionary* result = [NSMutableDictionary new];
+    
+    result[@"version"] = [NSString stringWithFormat:@"%ld", (long)input.version];
+    result[@"stdDomainParams"] = input.stdDomainParams;
+    result[@"keyAlgorithm"] = input.keyAlgorithm;
+    
+    return result;
+}
+
++(RGLRFIDAccessControlCA*)caProtocolFromJson:(NSDictionary*)input {
+    NSMutableDictionary* json = input.mutableCopy;
+    
+    json[@"Version"] = input[@"version"];
+    json[@"Scheme"] = input[@"scheme"];
+    json[@"KeyAlgorithm"] = input[@"keyAlgorithm"];
+    json[@"ChipIndividual"] = input[@"chipIndividual"];
+#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
+    return [[RGLRFIDAccessControlCA alloc] performSelector:NSSelectorFromString(@"initWithJSON:") withObject:json];
+#pragma clang diagnostic pop
+}
+
++(NSDictionary*)generateCaProtocol:(RGLRFIDAccessControlCA*)input {
+    if(input == nil) return nil;
+    NSMutableDictionary* result = [NSMutableDictionary new];
+    
+    result[@"version"] = [NSString stringWithFormat:@"%ld", (long)input.version];
+    result[@"scheme"] = input.scheme;
+    result[@"keyAlgorithm"] = input.keyAlgorithm;
+    result[@"chipIndividual"] = [NSNumber numberWithBool: input.chipIndividual];
+    
+    return result;
+}
+
 +(RGLDocumentReaderResults*)documentReaderResultsFromJson:(NSDictionary*)input {
     NSMutableArray<RGLDocumentReaderDocumentType*>* documentType = [NSMutableArray new];
     for(NSDictionary* item in [input valueForKey:@"documentType"]){
@@ -2671,26 +2717,26 @@ static NSMutableArray* weakReferencesHolder;
     }
     
     RGLDocumentReaderResults* result = [[RGLDocumentReaderResults alloc]
-            initWithDocumentTypes:documentType
-            textResult:[self documentReaderTextResultFromJson: [input valueForKey:@"textResult"]]
-            graphicResult:[self documentReaderGraphicResultFromJson: [input valueForKey:@"graphicResult"]]
-            rawResult:[input valueForKey:@"rawResult"]
-            documentPosition:documentPosition
-            barcodePosition:barcodePosition
-            mrzPosition:mrzPosition
-            imageQualityGroup:imageQuality
-            authenticityResults:[self documentReaderAuthenticityResultFromJson: [input valueForKey:@"authenticityResult"]]
-            rfidSessionData:[self rfidSessionDataFromJson: [input valueForKey:@"rfidSessionData"]]
-            chipPage:[[input valueForKey:@"chipPage"] integerValue]
-            barcodeResult:[self documentReaderBarcodeResultFromJson: [input valueForKey:@"barcodeResult"]]
-            vdsncData:[self vdsncDataFromJson: [input valueForKey:@"vdsncData"]]
-            vdsData:[self vdsDataFromJson: [input valueForKey:@"vdsData"]]
-            status:[self documentReaderResultsStatusFromJson: [input valueForKey:@"status"]]
-            processingFinished:[[input valueForKey:@"processingFinishedStatus"] integerValue]
-            morePagesAvailable:[[input valueForKey:@"morePagesAvailable"] integerValue]
-            elapsedTime:[[input valueForKey:@"elapsedTime"] integerValue]
-            elapsedTimeRFID:[[input valueForKey:@"elapsedTimeRFID"] integerValue]
-            transactionInfo:[self transactionInfoFromJson:[input valueForKey:@"transactionInfo"]]];
+                                        initWithDocumentTypes:documentType
+                                        textResult:[self documentReaderTextResultFromJson: [input valueForKey:@"textResult"]]
+                                        graphicResult:[self documentReaderGraphicResultFromJson: [input valueForKey:@"graphicResult"]]
+                                        rawResult:[input valueForKey:@"rawResult"]
+                                        documentPosition:documentPosition
+                                        barcodePosition:barcodePosition
+                                        mrzPosition:mrzPosition
+                                        imageQualityGroup:imageQuality
+                                        authenticityResults:[self documentReaderAuthenticityResultFromJson: [input valueForKey:@"authenticityResult"]]
+                                        rfidSessionData:[self rfidSessionDataFromJson: [input valueForKey:@"rfidSessionData"]]
+                                        chipPage:[[input valueForKey:@"chipPage"] integerValue]
+                                        barcodeResult:[self documentReaderBarcodeResultFromJson: [input valueForKey:@"barcodeResult"]]
+                                        vdsncData:[self vdsncDataFromJson: [input valueForKey:@"vdsncData"]]
+                                        vdsData:[self vdsDataFromJson: [input valueForKey:@"vdsData"]]
+                                        status:[self documentReaderResultsStatusFromJson: [input valueForKey:@"status"]]
+                                        processingFinished:[[input valueForKey:@"processingFinishedStatus"] integerValue]
+                                        morePagesAvailable:[[input valueForKey:@"morePagesAvailable"] integerValue]
+                                        elapsedTime:[[input valueForKey:@"elapsedTime"] integerValue]
+                                        elapsedTimeRFID:[[input valueForKey:@"elapsedTimeRFID"] integerValue]
+                                        transactionInfo:[self transactionInfoFromJson:[input valueForKey:@"transactionInfo"]]];
     
     [result setValue:[RGLWJSONConstructor base64Decode:input[@"dtcData"]] forKey:@"dtcData"];
     [result setValue:input[@"bsiTr03135Results"] forKey:@"bsiTr03135Results"];

package/ios/RGLWMain.h

@@ -18,10 +18,6 @@ extern UIViewController*_Nonnull(^ _Nonnull RGLWRootViewController)(void);
                  :(RGLWCallback _Nonnull)callback
                  :(RGLWEventSender _Nonnull)eventSender;
 
-@property NSNumber* _Nonnull doRequestPACertificates;
-@property NSNumber* _Nonnull doRequestTACertificates;
-@property NSNumber* _Nonnull doRequestTASignature;
-
 @end
 
 static NSString* _Nonnull completionEvent = @"completion";
@@ -32,5 +28,7 @@ static NSString* _Nonnull rfidOnRetryReadChipEvent = @"rfidOnRetryReadChipEvent"
 static NSString* _Nonnull paCertificateCompletionEvent = @"pa_certificate_completion";
 static NSString* _Nonnull taCertificateCompletionEvent = @"ta_certificate_completion";
 static NSString* _Nonnull taSignatureCompletionEvent = @"ta_signature_completion";
+static NSString* _Nonnull paceProtocolCompletionEvent = @"paceProtocolCompletionEvent";
+static NSString* _Nonnull caProtocolCompletionEvent = @"caProtocolCompletionEvent";
 static NSString* _Nonnull drVideoEncoderCompletionEvent = @"video_encoder_completion";
 static NSString* _Nonnull drOnCustomButtonTappedEvent = @"onCustomButtonTappedEvent";

package/ios/RGLWMain.m

@@ -41,12 +41,14 @@
         @"recognize": ^{ [self recognize :args[0]]; },
         @"startNewPage": ^{ [self startNewPage]; },
         @"stopScanner": ^{ [self stopScanner]; },
-        @"startRFIDReader": ^{ [self startRFIDReader :args[0] :args[1] :args[2]]; },
-        @"readRFID": ^{ [self readRFID :args[0] :args[1] :args[2]]; },
+        @"startRFIDReader": ^{ [self startRFIDReader :args[0]]; },
+        @"readRFID": ^{ [self readRFID :args[0]]; },
         @"stopRFIDReader": ^{ [self stopRFIDReader]; },
         @"providePACertificates": ^{ [self providePACertificates :args[0]]; },
         @"provideTACertificates": ^{ [self provideTACertificates :args[0]]; },
         @"provideTASignature": ^{ [self provideTASignature :args[0]]; },
+        @"selectPACEProtocol": ^{ [self selectPACEProtocol :args[0]]; },
+        @"selectCAProtocol": ^{ [self selectCAProtocol :args[0]]; },
         @"setTCCParams": ^{ [self setTCCParams :args[0] :callback]; },
         @"addPKDCertificates": ^{ [self addPKDCertificates :args[0]]; },
         @"clearPKDCertificates": ^{ [self clearPKDCertificates]; },
@@ -249,19 +251,15 @@ static NSDictionary* headers;
     });
 }
 
-+(void)startRFIDReader:(NSNumber*)paCert :(NSNumber*)taCert :(NSNumber*)taSig {
-    this.doRequestPACertificates = paCert;
-    this.doRequestTACertificates = taCert;
-    this.doRequestTASignature = taSig;
++(void)startRFIDReader:(NSDictionary*)config {
+    rfidReaderRequest = config;
     dispatch_async(dispatch_get_main_queue(), ^{
         [RGLDocReader.shared startRFIDReaderFromPresenter:RGLWRootViewController() completion:[self completion]];
     });
 }
 
-+(void)readRFID:(NSNumber*)paCert :(NSNumber*)taCert :(NSNumber*)taSig {
-    this.doRequestPACertificates = paCert;
-    this.doRequestTACertificates = taCert;
-    this.doRequestTASignature = taSig;
++(void)readRFID:(NSDictionary*)config {
+    rfidReaderRequest = config;
     [RGLDocReader.shared readRFID:^(RGLRFIDNotificationAction notificationAction, RGLRFIDNotify* _Nullable notification) {
         if (notification != nil) sendEvent(rfidOnProgressEvent, [RGLWJSONConstructor generateDocumentReaderNotification:notification]);
     } completion :^(RGLRFIDCompleteAction action, RGLDocumentReaderResults * _Nullable results, NSError * _Nullable error, RGLRFIDErrorCodes errorCode) {
@@ -291,6 +289,14 @@ static NSDictionary* headers;
     taSignatureCompletion([RGLWJSONConstructor base64Decode:signature]);
 }
 
++(void)selectPACEProtocol:(NSDictionary*)protocol {
+    paceProtocolCompletion([RGLWJSONConstructor paceProtocolFromJson:protocol]);
+}
+
++(void)selectCAProtocol:(NSDictionary*)protocol {
+    caProtocolCompletion([RGLWJSONConstructor caProtocolFromJson:protocol]);
+}
+
 +(void)setTCCParams:(NSDictionary*)params :(RGLWCallback)callback {
     [RGLDocReader.shared setTCCParams:[RGLWJSONConstructor tccParamsFromJson:params] completion:^(BOOL success, NSError * _Nullable error) {
         callback([RGLWJSONConstructor generateSuccessCompletion:success :error]);
@@ -626,9 +632,13 @@ RGLWCallback savedCallbackForBluetoothResult;
 RGLRFIDCertificatesCallback paCertificateCompletion;
 RGLRFIDCertificatesCallback taCertificateCompletion;
 RGLWRFIDSignatureCallback taSignatureCompletion;
+RGLRFIDAccessControlPACECallback paceProtocolCompletion;
+RGLRFIDAccessControlCACallback caProtocolCompletion;
+
+NSDictionary* rfidReaderRequest;
 
 - (void)onRequestPACertificatesWithSerial:(NSData *)serialNumber issuer:(RGLPAResourcesIssuer *)issuer callback:(RGLRFIDCertificatesCallback)callback {
-    if([self.doRequestPACertificates boolValue]) {
+    if (rfidReaderRequest && [rfidReaderRequest[@"paCertificates"] boolValue]) {
         paCertificateCompletion = callback;
         sendEvent(paCertificateCompletionEvent, [RGLWJSONConstructor generatePACertificateCompletion:serialNumber :issuer]);
     } else {
@@ -638,7 +648,7 @@ RGLWRFIDSignatureCallback taSignatureCompletion;
 }
 
 - (void)onRequestTACertificatesWithKey:(NSString *)keyCAR callback:(RGLRFIDCertificatesCallback)callback {
-    if([self.doRequestTACertificates boolValue]) {
+    if (rfidReaderRequest && [rfidReaderRequest[@"taCertificates"] boolValue]) {
         taCertificateCompletion = callback;
         sendEvent(taCertificateCompletionEvent, keyCAR);
     } else {
@@ -648,7 +658,7 @@ RGLWRFIDSignatureCallback taSignatureCompletion;
 }
 
 - (void)onRequestTASignatureWithChallenge:(RGLTAChallenge *)challenge callback:(void(^)(NSData *signature))callback {
-    if([self.doRequestTASignature boolValue]) {
+    if (rfidReaderRequest && [rfidReaderRequest[@"taSignature"] boolValue]) {
         taSignatureCompletion = callback;
         sendEvent(taSignatureCompletionEvent, [RGLWJSONConstructor dictToString: [RGLWJSONConstructor generateTAChallenge:challenge]]);
     } else {
@@ -657,6 +667,32 @@ RGLWRFIDSignatureCallback taSignatureCompletion;
     }
 }
 
+- (void)onRequestPACEProtocolWithOptions:(NSArray<RGLRFIDAccessControlPACE*>*)protocols callback:(RGLRFIDAccessControlPACECallback)callback {
+    if (rfidReaderRequest && [rfidReaderRequest[@"paceProtocol"] boolValue]) {
+        paceProtocolCompletion = callback;
+        NSMutableArray *array = [NSMutableArray new];
+        for(RGLRFIDAccessControlPACE* item in protocols)
+            [array addObject:[RGLWJSONConstructor generatePaceProtocol:item]];
+        sendEvent(paceProtocolCompletionEvent, [RGLWJSONConstructor arrayToString: array]);
+    } else {
+        paceProtocolCompletion = nil;
+        callback(nil);
+    }
+}
+
+- (void)onRequestCAProtocolWithOptions:(NSArray<RGLRFIDAccessControlCA*>*)protocols callback:(RGLRFIDAccessControlCACallback)callback {
+    if (rfidReaderRequest && [rfidReaderRequest[@"caProtocol"] boolValue]) {
+        caProtocolCompletion = callback;
+        NSMutableArray *array = [NSMutableArray new];
+        for(RGLRFIDAccessControlCA* item in protocols)
+            [array addObject:[RGLWJSONConstructor generateCaProtocol:item]];
+        sendEvent(caProtocolCompletionEvent, [RGLWJSONConstructor arrayToString: array]);
+    } else {
+        caProtocolCompletionEvent = nil;
+        callback(nil);
+    }
+}
+
 - (void)didChipConnected {
     sendEvent(rfidOnChipDetectedEvent, @"");
 }

package/ios/RNDocumentReader.m

@@ -18,6 +18,8 @@ static NSMutableArray<RCTResponseSenderBlock>* _firedCallbacks = nil;
              paCertificateCompletionEvent,
              taCertificateCompletionEvent,
              taSignatureCompletionEvent,
+             paceProtocolCompletionEvent,
+             caProtocolCompletionEvent,
              drVideoEncoderCompletionEvent,
              drOnCustomButtonTappedEvent];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@regulaforensics/document-reader",
-  "version": "9.4.717-rc",
+  "version": "9.4.720-nightly",
   "description": "This is an npm module for Regula Document Reader SDK. It allows you to read various kinds of identification documents using your phone's camera.",
   "main": "www/react-native/index.js",
   "module": "www/capacitor/index.js",