@regulaforensics/document-reader 9.1.484-rc → 9.1.493-beta

package/examples/ionic/package.json

@@ -6,19 +6,19 @@
     "android": "scripts/android.sh"
   },
   "dependencies": {
-    "@angular-devkit/build-angular": "^20.3.1",
-    "@angular/cli": "^20.3.1",
-    "@angular/common": "^20.3.0",
-    "@angular/compiler-cli": "^20.3.0",
-    "@angular/core": "^20.3.0",
-    "@angular/forms": "^20.3.0",
-    "@angular/platform-browser-dynamic": "^20.3.0",
-    "@angular/router": "^20.3.0",
+    "@angular-devkit/build-angular": "^21.0.1",
+    "@angular/cli": "^21.0.1",
+    "@angular/common": "^21.0.2",
+    "@angular/compiler-cli": "^21.0.2",
+    "@angular/core": "^21.0.2",
+    "@angular/forms": "^21.0.2",
+    "@angular/platform-browser-dynamic": "^21.0.2",
+    "@angular/router": "^21.0.2",
     "@awesome-cordova-plugins/camera": "^8.1.0",
     "@awesome-cordova-plugins/file": "^8.1.0",
-    "@ionic/angular": "^8.7.3",
+    "@ionic/angular": "^8.7.11",
     "@ionic/cordova-builders": "^12.3.0",
-    "@regulaforensics/document-reader": "9.1.484-rc",
+    "@regulaforensics/document-reader": "9.1.493-beta",
     "@regulaforensics/document-reader-core-fullauthrfid": "8.4.787",
     "@regulaforensics/document-reader-btdevice": "8.4.31",
     "cordova-android": "^14.0.1",

package/examples/react_native/app.config.ts

@@ -20,7 +20,9 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
         'A0000002480100',
         'A0000002480200',
         'A0000002480300',
-        'A00000045645444C2D3031'
+        'A0000002480400',
+        'A00000045645444C2D3031',
+        'D2760000850101',
       ]
     },
     entitlements: { 'com.apple.developer.nfc.readersession.formats': ['TAG'] },

package/examples/react_native/package-lock.json

@@ -6596,9 +6596,9 @@
       "license": "MIT"
     },
     "node_modules/node-forge": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
-      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
+      "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==",
       "license": "(BSD-3-Clause OR GPL-2.0)",
       "engines": {
         "node": ">= 6.13.0"

package/examples/react_native/package.json

@@ -8,7 +8,7 @@
     "start": "expo start"
   },
   "dependencies": {
-    "@regulaforensics/document-reader": "9.1.484-rc",
+    "@regulaforensics/document-reader": "9.1.493-beta",
     "@regulaforensics/document-reader-core-fullauthrfid": "8.4.787",
     "@regulaforensics/document-reader-btdevice": "8.4.31",
     "react-native": "^0.81.4",

package/ios/RGLWConfig.m

@@ -35,6 +35,7 @@
         functionality.singleResult = [[options valueForKey:@"singleResult"] boolValue];
     if(options[@"torchTurnedOn"]) functionality.torchTurnedOn = [options[@"torchTurnedOn"] boolValue];
     if(options[@"preventScreenRecording"]) functionality.preventScreenRecording = [options[@"preventScreenRecording"] boolValue];
+    if(options[@"homeIndicatorAutoHide"]) functionality.homeIndicatorAutoHide = [options[@"homeIndicatorAutoHide"] boolValue];
     
     // Int
     if([options valueForKey:@"showCaptureButtonDelayFromDetect"] != nil)
@@ -61,6 +62,7 @@
     // Float
     if([options valueForKey:@"zoomFactor"] != nil)
         functionality.zoomFactor = [[options valueForKey:@"zoomFactor"] floatValue];
+    if(options[@"mdlTimeout"]) functionality.mDLTimeout = [options[@"mdlTimeout"] doubleValue];
     
     // Custom
     // in android - cameraSize
@@ -90,6 +92,7 @@
     result[@"singleResult"] = [NSNumber numberWithBool:functionality.singleResult];
     result[@"torchTurnedOn"] = @(functionality.torchTurnedOn);
     result[@"preventScreenRecording"] = @(functionality.preventScreenRecording);
+    result[@"homeIndicatorAutoHide"] = @(functionality.homeIndicatorAutoHide);
     
     // Int
     result[@"showCaptureButtonDelayFromDetect"] = [NSNumber numberWithDouble:functionality.showCaptureButtonDelayFromDetect];
@@ -107,6 +110,7 @@
     
     // Float
     result[@"zoomFactor"] = [NSNumber numberWithFloat:functionality.zoomFactor];
+    result[@"mdlTimeout"] = @(functionality.mDLTimeout);
     
     // Custom
     // in android - cameraSize
@@ -256,8 +260,8 @@
         processParams.documentGroupFilter = [options mutableArrayValueForKey:@"documentGroupFilter"];
     if([options valueForKey:@"lcidIgnoreFilter"] != nil)
         processParams.lcidIgnoreFilter = [options mutableArrayValueForKey:@"lcidIgnoreFilter"];
-    if([options valueForKey:@"lcidFilter"] != nil)
-        processParams.lcidFilter = [options mutableArrayValueForKey:@"lcidFilter"];
+    if (options[@"lcidFilter"]) processParams.lcidFilter = options[@"lcidFilter"];
+    if (options[@"fieldTypesIgnoreFilter"]) processParams.fieldTypesIgnoreFilter = options[@"fieldTypesIgnoreFilter"];
 
     // JSONObject
     if (options[@"customParams"]) processParams.customParams = options[@"customParams"];
@@ -357,6 +361,7 @@
     result[@"documentGroupFilter"] = processParams.documentGroupFilter;
     result[@"lcidIgnoreFilter"] = processParams.lcidIgnoreFilter;
     result[@"lcidFilter"] = processParams.lcidFilter;
+    result[@"fieldTypesIgnoreFilter"] = processParams.fieldTypesIgnoreFilter;
     result[@"mrzFormatsFilter"] = processParams.mrzFormatsFilter;
     result[@"resultTypeOutput"] = processParams.resultTypeOutput;
     
@@ -454,6 +459,7 @@
     if(options[@"activityIndicatorPortraitPositionMultiplier"]) customization.activityIndicatorPortraitPositionMultiplier = [options[@"activityIndicatorPortraitPositionMultiplier"] floatValue];
     if(options[@"activityIndicatorLandscapePositionMultiplier"]) customization.activityIndicatorLandscapePositionMultiplier = [options[@"activityIndicatorLandscapePositionMultiplier"] floatValue];
     if(options[@"cameraPreviewVerticalPositionMultiplier"]) customization.previewLayerPositionMultiplier = [options[@"cameraPreviewVerticalPositionMultiplier"] floatValue];
+    if(options[@"multipageButtonPositionMultiplier"]) customization.multipageButtonPositionMultiplier = [options[@"multipageButtonPositionMultiplier"] floatValue];
     
     // Drawable
     if([options valueForKey:@"multipageAnimationFrontImage"] != nil)
@@ -568,6 +574,7 @@
     result[@"activityIndicatorPortraitPositionMultiplier"] = [NSNumber numberWithFloat:customization.activityIndicatorPortraitPositionMultiplier];
     result[@"activityIndicatorLandscapePositionMultiplier"] = [NSNumber numberWithFloat:customization.activityIndicatorLandscapePositionMultiplier];
     result[@"cameraPreviewVerticalPositionMultiplier"] = [NSNumber numberWithFloat:customization.previewLayerPositionMultiplier];
+    result[@"multipageButtonPositionMultiplier"] = [NSNumber numberWithFloat:customization.multipageButtonPositionMultiplier];
     
     // Drawable
     result[@"multipageAnimationFrontImage"] = [RGLWJSONConstructor base64WithImage:customization.multipageAnimationFrontImage];

package/ios/RGLWJSONConstructor.h

@@ -20,6 +20,7 @@
 +(NSString* _Nullable)generateCompletion:(NSNumber*_Nonnull)action :(RGLDocumentReaderResults*_Nullable)results :(NSError*_Nullable)error;
 +(NSString* _Nonnull)generatePACertificateCompletion:(NSData *_Nullable)serialNumber :(RGLPAResourcesIssuer *_Nullable)issuer;
 +(NSString* _Nullable)generateFinalizePackageCompletion:(NSNumber*_Nonnull)action :(RGLTransactionInfo*_Nullable)info :(NSError*_Nullable)error;
++(NSString* _Nullable)generateDeviceEngagementCompletion:(RGLDeviceEngagement* _Nullable)deviceEngagement :(NSError* _Nullable)error;
 
 +(RGLConfig* _Nullable)configFromJson:(NSDictionary* _Nullable)input;
 +(NSDictionary* _Nullable)generateConfig:(RGLConfig* _Nullable)input;
@@ -126,6 +127,10 @@
 +(NSDictionary* _Nullable)generateBytesData:(RGLBytesData* _Nullable)input;
 +(RGLVDSNCData* _Nullable)vdsncDataFromJson:(NSDictionary* _Nullable)input;
 +(NSDictionary* _Nullable)generateVDSNCData:(RGLVDSNCData* _Nullable)input;
++(RGLDocFeature* _Nullable)docFeatureFromJson:(NSDictionary* _Nullable)input;
++(NSDictionary* _Nullable)generateDocFeature:(RGLDocFeature* _Nullable)input;
++(RGLVDSData* _Nullable)vdsDataFromJson:(NSDictionary* _Nullable)input;
++(NSDictionary* _Nullable)generateVDSData:(RGLVDSData* _Nullable)input;
 +(RGLOpticalStatus* _Nullable)opticalStatusFromJson:(NSDictionary* _Nullable)input;
 +(NSDictionary* _Nullable)generateOpticalStatus:(RGLOpticalStatus* _Nullable)input;
 +(RGLRFIDSessionDataStatus* _Nullable)rfidSessionDataStatusFromJson:(NSDictionary* _Nullable)input;
@@ -175,6 +180,20 @@
 +(NSDictionary* _Nullable)generateTCCParams:(RGLTCCParams* _Nullable)input;
 +(RGLTransactionInfo* _Nullable)transactionInfoFromJson:(NSDictionary* _Nullable)input;
 +(NSDictionary* _Nullable)generateTransactionInfo:(RGLTransactionInfo* _Nullable)input;
++(RGLDetailsAge* _Nullable)detailsAgeFromJson:(NSDictionary* _Nullable)input;
++(NSDictionary* _Nullable)generateDetailsAge:(RGLDetailsAge* _Nullable)input;
++(RGLDeviceRetrievalMethod* _Nullable)deviceRetrievalMethodFromJson:(NSDictionary* _Nullable)input;
++(NSDictionary* _Nullable)generateDeviceRetrievalMethod:(RGLDeviceRetrievalMethod* _Nullable)input;
++(RGLDocumentRequest18013MDL* _Nullable)documentRequest18013MDLFromJson:(NSDictionary* _Nullable)input;
++(NSDictionary* _Nullable)generateDocumentRequest18013MDL:(RGLDocumentRequest18013MDL* _Nullable)input;
++(RGLDataRetrieval* _Nullable)dataRetrievalFromJson:(NSDictionary* _Nullable)input;
++(NSDictionary* _Nullable)generateDataRetrieval:(RGLDataRetrieval* _Nullable)input;
++(RGLDeviceEngagement* _Nullable)deviceEngagementFromJson:(NSDictionary* _Nullable)input;
++(NSDictionary* _Nullable)generateDeviceEngagement:(RGLDeviceEngagement* _Nullable)input;
++(RGLNameSpaceMDL* _Nullable)nameSpaceMDLFromJson:(NSDictionary* _Nullable)input;
++(NSDictionary* _Nullable)generateNameSpaceMDL:(RGLNameSpaceMDL* _Nullable)input;
++(RGLDocumentRequestMDL* _Nullable)documentRequestMDLFromJson:(NSDictionary* _Nullable)input;
++(NSDictionary* _Nullable)generateDocumentRequestMDL:(RGLDocumentRequestMDL* _Nullable)input;
 
 @end
 

package/ios/RGLWJSONConstructor.m

@@ -1959,6 +1959,9 @@ static NSMutableArray* weakReferencesHolder;
     result[@"detailsRFID"] = [self generateRFIDSessionDataStatus:input.detailsRFID];
     result[@"portrait"] = @(input.portrait);
     result[@"stopList"] = @(input.stopList);
+    result[@"mDL"] = @(input.mDL);
+    result[@"age"] = @(input.age);
+    result[@"detailsAge"] = [self generateDetailsAge:input.detailsAge];
     
     return result;
 }
@@ -2017,6 +2020,24 @@ static NSMutableArray* weakReferencesHolder;
     return result;
 }
 
++(RGLDetailsAge*)detailsAgeFromJson:(NSDictionary*)input {
+    return [RGLDetailsAge performSelector:NSSelectorFromString(@"detailsAgeWithJSON:") withObject:input];
+}
+
++(NSDictionary*)generateDetailsAge:(RGLDetailsAge*)input {
+    if(input == nil) return nil;
+    NSMutableDictionary* result = [NSMutableDictionary new];
+    
+    result[@"threshold"] = input.threshold;
+    result[@"overThreshold"] = @(input.overThreshold);
+    result[@"over18"] = @(input.over18);
+    result[@"over21"] = @(input.over21);
+    result[@"over25"] = @(input.over25);
+    result[@"over65"] = @(input.over65);
+    
+    return result;
+}
+
 +(NSDictionary*)vdsncDataDictionaryFromJson:(NSDictionary*)input {
     NSMutableDictionary* json = [NSMutableDictionary new];
     
@@ -2249,6 +2270,332 @@ static NSMutableArray* weakReferencesHolder;
     return result;
 }
 
++(RGLDocFeature*)docFeatureFromJson:(NSDictionary*)input {
+    NSMutableDictionary* json = input.mutableCopy;
+    json[@"Type"] = input[@"type"];
+    json[@"Data"] = [self bytesDataDictionaryFromJson: input[@"data"]];
+    return [RGLDocFeature initWithJSON: json];
+}
+
++(NSDictionary*)generateDocFeature:(RGLDocFeature*)input {
+    if(input == nil) return nil;
+    NSMutableDictionary* result = [NSMutableDictionary new];
+    
+    result[@"type"] = input.type;
+    result[@"data"] = [self generateBytesData:input.data];
+    
+    return result;
+}
+
++(RGLVDSData*)vdsDataFromJson:(NSDictionary*)input {
+    NSMutableArray<RGLCertificateChain*>* certificateChain = [NSMutableArray new];
+    for(NSDictionary* item in [input valueForKey:@"certificateChain"]){
+        [certificateChain addObject:[self certificateChainFromJson:item]];
+    }
+    NSMutableArray<RGLDocFeature*>* docFeatures = [NSMutableArray new];
+    for(NSDictionary* item in [input valueForKey:@"docFeatures"]){
+        [docFeatures addObject:[self docFeatureFromJson:item]];
+    }
+    NSMutableArray<NSNumber*>* notifications = [NSMutableArray new];
+    for(NSNumber* item in [input valueForKey:@"notifications"]){
+        [notifications addObject:item];
+    }
+    
+    RGLVDSData* result = [RGLVDSData alloc];
+    SEL sel = NSSelectorFromString(@"initWithType:docType:featureRef:version:certificate:issuingCountry:docIssueDate:signature:signatureDate:signer:certificateChain:docFeatures:notifications:");
+    IMP imp = [result methodForSelector:sel];
+    void (*func)(id, SEL, NSInteger, NSInteger, NSInteger, NSInteger, id, id, id, id, id, id, id, id, id) = (void *)imp;
+    func(result,
+         sel,
+         [input[@"type"] integerValue],
+         [input[@"docType"] integerValue],
+         [input[@"featureRef"] integerValue],
+         [input[@"version"] integerValue],
+         input[@"certificate"],
+         input[@"issuingCountry"],
+         input[@"docIssueDate"],
+         [self bytesDataFromJson:input[@"signature"]],
+         input[@"signatureDate"],
+         input[@"signer"],
+         certificateChain,
+         docFeatures,
+         notifications);
+    return result;
+}
+
++(NSDictionary*)generateVDSData:(RGLVDSData*)input {
+    if(input == nil) return nil;
+    NSMutableDictionary* result = [NSMutableDictionary new];
+    
+    result[@"type"] = @(input.type);
+    result[@"docType"] = @(input.docType);
+    result[@"featureRef"] = @(input.featureRef);
+    result[@"version"] = @(input.version);
+    result[@"certificate"] = input.certificate;
+    result[@"issuingCountry"] = input.issuingCountry;
+    result[@"docIssueDate"] = input.docIssueDate;
+    result[@"signature"] = [self generateBytesData:input.signature];
+    result[@"signatureDate"] = input.signatureDate;
+    result[@"signer"] = input.signer;
+    if(input.certificateChain != nil){
+        NSMutableArray *array = [NSMutableArray new];
+        for(RGLCertificateChain* item in input.certificateChain)
+            [array addObject:[self generateCertificateChain:item]];
+        result[@"certificateChain"] = array;
+    }
+    if(input.docFeatures != nil){
+        NSMutableArray *array = [NSMutableArray new];
+        for(RGLDocFeature* item in input.docFeatures)
+            [array addObject:[self generateDocFeature:item]];
+        result[@"docFeatures"] = array;
+    }
+    if(input.notifications != nil){
+        NSMutableArray *array = [NSMutableArray new];
+        for(NSNumber* item in input.notifications)
+            [array addObject:item];
+        result[@"notifications"] = array;
+    }
+    
+    return result;
+}
+
++(RGLDeviceRetrievalMethod*)deviceRetrievalMethodFromJson:(NSDictionary*)input {
+    return [[RGLDeviceRetrievalMethod alloc] initWithJSON:input];
+}
+
++(NSDictionary*)generateDeviceRetrievalMethod:(RGLDeviceRetrievalMethod*)input {
+    if(input == nil) return nil;
+    NSMutableDictionary* result = [NSMutableDictionary new];
+    
+    result[@"type"] = @(input.type);
+    result[@"version"] = input.version;
+    result[@"cmdMaxLength"] = input.cmdMaxLength;
+    result[@"respMaxLength"] = input.respMaxLength;
+    result[@"clientModeSupport"] = input.clientModeSupport;
+    result[@"clientModeUUID"] = input.clientModeUUID;
+    result[@"serverModeSupport"] = input.serverModeSupport;
+    result[@"serverModeUUID"] = input.serverModeUUID;
+    
+    return result;
+}
+
++(RGLDeviceEngagement*)deviceEngagementFromJson:(NSDictionary*)input {
+    RGLDeviceEngagement* result = [RGLDeviceEngagement new];
+    
+    
+    NSMutableArray<RGLDeviceRetrievalMethod*>* deviceRetrievalMethods = [NSMutableArray new];
+    for(NSDictionary* item in [input valueForKey:@"deviceRetrievalMethods"]){
+        [deviceRetrievalMethods addObject:[self deviceRetrievalMethodFromJson: item]];
+    }
+    result.deviceRetrievalMethods = deviceRetrievalMethods;
+    
+    return result;
+    
+}
+
++(NSDictionary*)generateDeviceEngagement:(RGLDeviceEngagement*)input {
+    if(input == nil) return nil;
+    NSMutableDictionary* result = [NSMutableDictionary new];
+    
+    NSMutableArray *array = [NSMutableArray new];
+    for(RGLDeviceRetrievalMethod* item in input.deviceRetrievalMethods)
+        [array addObject:[self generateDeviceRetrievalMethod:item]];
+    result[@"deviceRetrievalMethods"] = array;
+    
+    return result;
+}
+
++(RGLNameSpaceMDL*)nameSpaceMDLFromJson:(NSDictionary*)input {
+    RGLNameSpaceMDL* result = [[RGLNameSpaceMDL alloc] initWithName:input[@"name"]];
+    
+    [result setValue:input[@"map"] forKey:@"jsonDict"];
+
+    return result;
+    
+}
+
++(NSDictionary*)generateNameSpaceMDL:(RGLNameSpaceMDL*)input {
+    if(input == nil) return nil;
+    NSMutableDictionary* result = [NSMutableDictionary new];
+    
+    result[@"name"] = input.name;
+    result[@"map"] = [input valueForKey:@"jsonDict"];
+    
+    return result;
+}
+
++(RGLDocumentRequestMDL*)documentRequestMDLFromJson:(NSDictionary*)input {
+    NSString* docType = input[@"docType"];
+    if([docType  isEqual: @"org.iso.18013.5.1.mDL"]) return [self documentRequest18013MDLFromJson: input];
+    RGLDocumentRequestMDL* result = [[RGLDocumentRequestMDL alloc] initWithDocType:docType];
+    
+    NSMutableArray<RGLNameSpaceMDL*>* nameSpaces = [NSMutableArray new];
+    for(NSDictionary* item in [input valueForKey:@"namespaces"]){
+        [nameSpaces addObject:[self nameSpaceMDLFromJson: item]];
+    }
+    [result setValue:nameSpaces forKey:@"nameSpaces"];
+
+    return result;
+    
+}
+
++(NSDictionary*)generateDocumentRequestMDL:(RGLDocumentRequestMDL*)input {
+    if(input == nil) return nil;
+    NSString* docType = [input valueForKey:@"docType"];
+    if([docType  isEqual: @"org.iso.18013.5.1.mDL"]) return [self generateDocumentRequest18013MDL: (RGLDocumentRequest18013MDL*)input];
+    NSMutableDictionary* result = [NSMutableDictionary new];
+    
+    NSMutableArray *array = [NSMutableArray new];
+    for(RGLNameSpaceMDL* item in [input valueForKey:@"nameSpaces"])
+        [array addObject:[self generateNameSpaceMDL:item]];
+    
+    result[@"docType"] = docType;
+    result[@"namespaces"] = array;
+    
+    return result;
+}
+
++(RGLDocumentRequest18013MDL*)documentRequest18013MDLFromJson:(NSDictionary*)input {
+    if(input == nil) return nil;
+    RGLDocumentRequest18013MDL* result = [RGLDocumentRequest18013MDL new];
+    
+    [result setValue:[input valueForKey:@"docType"] forKey:@"docType"];
+    NSMutableArray<RGLNameSpaceMDL*>* nameSpaces = [NSMutableArray new];
+    for(NSDictionary* item in [input valueForKey:@"namespaces"]){
+        [nameSpaces addObject:[self nameSpaceMDLFromJson: item]];
+    }
+    [result setValue:nameSpaces forKey:@"nameSpaces"];
+    if (input[@"familyName"]) result.familyName = [input[@"familyName"] integerValue];
+    if (input[@"givenName"]) result.givenName = [input[@"givenName"] integerValue];
+    if (input[@"birthDate"]) result.birthDate = [input[@"birthDate"] integerValue];
+    if (input[@"issueDate"]) result.issueDate = [input[@"issueDate"] integerValue];
+    if (input[@"expiryDate"]) result.expiryDate = [input[@"expiryDate"] integerValue];
+    if (input[@"issuingCountry"]) result.issuingCountry = [input[@"issuingCountry"] integerValue];
+    if (input[@"issuingAuthority"]) result.issuingAuthority = [input[@"issuingAuthority"] integerValue];
+    if (input[@"documentNumber"]) result.documentNumber = [input[@"documentNumber"] integerValue];
+    if (input[@"portrait"]) result.portrait = [input[@"portrait"] integerValue];
+    if (input[@"drivingPrivileges"]) result.drivingPrivileges = [input[@"drivingPrivileges"] integerValue];
+    if (input[@"unDistinguishingSign"]) result.unDistinguishingSign = [input[@"unDistinguishingSign"] integerValue];
+    if (input[@"administrativeNumber"]) result.administrativeNumber = [input[@"administrativeNumber"] integerValue];
+    if (input[@"sex"]) result.sex = [input[@"sex"] integerValue];
+    if (input[@"height"]) result.height = [input[@"height"] integerValue];
+    if (input[@"weight"]) result.weight = [input[@"weight"] integerValue];
+    if (input[@"eyeColour"]) result.eyeColour = [input[@"eyeColour"] integerValue];
+    if (input[@"hairColour"]) result.hairColour = [input[@"hairColour"] integerValue];
+    if (input[@"birthPlace"]) result.birthPlace = [input[@"birthPlace"] integerValue];
+    if (input[@"residentAddress"]) result.residentAddress = [input[@"residentAddress"] integerValue];
+    if (input[@"portraitCaptureDate"]) result.portraitCaptureDate = [input[@"portraitCaptureDate"] integerValue];
+    if (input[@"ageInYears"]) result.ageInYears = [input[@"ageInYears"] integerValue];
+    if (input[@"ageBirthYear"]) result.ageBirthYear = [input[@"ageBirthYear"] integerValue];
+    if (input[@"ageOver18"]) result.ageOver18 = [input[@"ageOver18"] integerValue];
+    if (input[@"issuingJurisdiction"]) result.issuingJurisdiction = [input[@"issuingJurisdiction"] integerValue];
+    if (input[@"nationality"]) result.nationality = [input[@"nationality"] integerValue];
+    if (input[@"residentCity"]) result.residentCity = [input[@"residentCity"] integerValue];
+    if (input[@"residentState"]) result.residentState = [input[@"residentState"] integerValue];
+    if (input[@"residentPostalCode"]) result.residentPostalCode = [input[@"residentPostalCode"] integerValue];
+    if (input[@"residentCountry"]) result.residentCountry = [input[@"residentCountry"] integerValue];
+    if (input[@"biometricTemplateFace"]) result.biometricTemplateFace = [input[@"biometricTemplateFace"] integerValue];
+    if (input[@"biometricTemplateIris"]) result.biometricTemplateIris = [input[@"biometricTemplateIris"] integerValue];
+    if (input[@"biometricTemplateFinger"]) result.biometricTemplateFinger = [input[@"biometricTemplateFinger"] integerValue];
+    if (input[@"biometricTemplateSignatureSign"]) result.biometricTemplateSignatureSign = [input[@"biometricTemplateSignatureSign"] integerValue];
+    if (input[@"familyNameNationalCharacter"]) result.familyNameNationalCharacter = [input[@"familyNameNationalCharacter"] integerValue];
+    if (input[@"givenNameNationalCharacter"]) result.givenNameNationalCharacter = [input[@"givenNameNationalCharacter"] integerValue];
+    if (input[@"signatureUsualMark"]) result.signatureUsualMark = [input[@"signatureUsualMark"] integerValue];
+    
+    return result;
+}
+
++(NSDictionary*)generateDocumentRequest18013MDL:(RGLDocumentRequest18013MDL*)input {
+    if(input == nil) return nil;
+    NSMutableDictionary* result = [NSMutableDictionary new];
+    
+    NSMutableArray *array = [NSMutableArray new];
+    for(RGLNameSpaceMDL* item in [input valueForKey:@"nameSpaces"])
+        [array addObject:[self generateNameSpaceMDL:item]];
+    
+    result[@"docType"] = [input valueForKey:@"docType"];
+    result[@"namespaces"] = array;
+    if (input.familyName != -1) result[@"familyName"] = @(input.familyName);
+    if (input.givenName != -1) result[@"givenName"] = @(input.givenName);
+    if (input.birthDate != -1) result[@"birthDate"] = @(input.birthDate);
+    if (input.issueDate != -1) result[@"issueDate"] = @(input.issueDate);
+    if (input.expiryDate != -1) result[@"expiryDate"] = @(input.expiryDate);
+    if (input.issuingCountry != -1) result[@"issuingCountry"] = @(input.issuingCountry);
+    if (input.issuingAuthority != -1) result[@"issuingAuthority"] = @(input.issuingAuthority);
+    if (input.documentNumber != -1) result[@"documentNumber"] = @(input.documentNumber);
+    if (input.portrait != -1) result[@"portrait"] = @(input.portrait);
+    if (input.drivingPrivileges != -1) result[@"drivingPrivileges"] = @(input.drivingPrivileges);
+    if (input.unDistinguishingSign != -1) result[@"unDistinguishingSign"] = @(input.unDistinguishingSign);
+    if (input.administrativeNumber != -1) result[@"administrativeNumber"] = @(input.administrativeNumber);
+    if (input.sex != -1) result[@"sex"] = @(input.sex);
+    if (input.height != -1) result[@"height"] = @(input.height);
+    if (input.weight != -1) result[@"weight"] = @(input.weight);
+    if (input.eyeColour != -1) result[@"eyeColour"] = @(input.eyeColour);
+    if (input.hairColour != -1) result[@"hairColour"] = @(input.hairColour);
+    if (input.birthPlace != -1) result[@"birthPlace"] = @(input.birthPlace);
+    if (input.residentAddress != -1) result[@"residentAddress"] = @(input.residentAddress);
+    if (input.portraitCaptureDate != -1) result[@"portraitCaptureDate"] = @(input.portraitCaptureDate);
+    if (input.ageInYears != -1) result[@"ageInYears"] = @(input.ageInYears);
+    if (input.ageBirthYear != -1) result[@"ageBirthYear"] = @(input.ageBirthYear);
+    if (input.ageOver18 != -1) result[@"ageOver18"] = @(input.ageOver18);
+    if (input.issuingJurisdiction != -1) result[@"issuingJurisdiction"] = @(input.issuingJurisdiction);
+    if (input.nationality != -1) result[@"nationality"] = @(input.nationality);
+    if (input.residentCity != -1) result[@"residentCity"] = @(input.residentCity);
+    if (input.residentState != -1) result[@"residentState"] = @(input.residentState);
+    if (input.residentPostalCode != -1) result[@"residentPostalCode"] = @(input.residentPostalCode);
+    if (input.residentCountry != -1) result[@"residentCountry"] = @(input.residentCountry);
+    if (input.biometricTemplateFace != -1) result[@"biometricTemplateFace"] = @(input.biometricTemplateFace);
+    if (input.biometricTemplateIris != -1) result[@"biometricTemplateIris"] = @(input.biometricTemplateIris);
+    if (input.biometricTemplateFinger != -1) result[@"biometricTemplateFinger"] = @(input.biometricTemplateFinger);
+    if (input.biometricTemplateSignatureSign != -1) result[@"biometricTemplateSignatureSign"] = @(input.biometricTemplateSignatureSign);
+    if (input.familyNameNationalCharacter != -1) result[@"familyNameNationalCharacter"] = @(input.familyNameNationalCharacter);
+    if (input.givenNameNationalCharacter != -1) result[@"givenNameNationalCharacter"] = @(input.givenNameNationalCharacter);
+    if (input.signatureUsualMark != -1) result[@"signatureUsualMark"] = @(input.signatureUsualMark);
+    
+    return result;
+}
+
++(RGLDataRetrieval*)dataRetrievalFromJson:(NSDictionary*)input {
+    RGLDataRetrieval* result = [[RGLDataRetrieval alloc] initWithDeviceRetrieval:[input[@"deviceRetrieval"] integerValue]];
+    
+    [result setValue:input[@"docRequestPreset"] forKey:@"docRequestPreset"];
+    [result setValue:input[@"intentToRetain"] forKey:@"intentToRetain"];
+    
+    NSMutableArray<RGLDocumentRequestMDL*>* requests = [NSMutableArray new];
+    for(NSDictionary* item in [input valueForKey:@"requests"]){
+        [requests addObject:[self documentRequestMDLFromJson: item]];
+    }
+    result.requests = requests;
+    
+    return result;
+    
+}
+
++(NSDictionary*)generateDataRetrieval:(RGLDataRetrieval*)input {
+    if(input == nil) return nil;
+    NSMutableDictionary* result = [NSMutableDictionary new];
+    
+    result[@"deviceRetrieval"] = [input valueForKey:@"deviceRetrieval"];
+    result[@"docRequestPreset"] = [input valueForKey:@"docRequestPreset"];
+    result[@"intentToRetain"] = [input valueForKey:@"intentToRetain"];
+    
+    NSMutableArray *array = [NSMutableArray new];
+    for(RGLDocumentRequestMDL* item in input.requests)
+        [array addObject:[self generateDocumentRequestMDL:item]];
+    result[@"requests"] = array;
+    
+    return result;
+}
+
++(NSString*)generateDeviceEngagementCompletion:(RGLDeviceEngagement*)deviceEngagement :(NSError*)error {
+    NSMutableDictionary* result = [NSMutableDictionary new];
+    
+    result[@"deviceEngagement"] = [self generateDeviceEngagement:deviceEngagement];
+    result[@"error"] = [self generateError:error];
+    
+    return [RGLWJSONConstructor dictToString: result];
+}
+
 +(RGLDocumentReaderResults*)documentReaderResultsFromJson:(NSDictionary*)input {
     NSMutableArray<RGLDocumentReaderDocumentType*>* documentType = [NSMutableArray new];
     for(NSDictionary* item in [input valueForKey:@"documentType"]){
@@ -2285,6 +2632,7 @@ static NSMutableArray* weakReferencesHolder;
             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]
@@ -2344,6 +2692,7 @@ static NSMutableArray* weakReferencesHolder;
     result[@"rawResult"] = input.rawResult;
     result[@"status"] = [self generateDocumentReaderResultsStatus:input.status];
     result[@"vdsncData"] = [self generateVDSNCData:input.vdsncData];
+    result[@"vdsData"] = [self generateVDSData:input.vdsData];
     result[@"dtcData"] = [self base64Encode: input.dtcData];
     result[@"transactionInfo"] = [self generateTransactionInfo:input.transactionInfo];
     

package/ios/RGLWMain.m

@@ -55,6 +55,13 @@
         @"btDeviceRequestFlashing": ^{ /* android only */ },
         @"btDeviceRequestFlashingFullIR": ^{ /* android only */ },
         @"btDeviceRequestTurnOffAll": ^{ /* android only */ },
+        @"startReadMDl": ^{ [self startReadMDl :args[0] :args[1] :callback]; },
+        @"startEngageDevice": ^{ [self startEngageDevice :args[0] :callback]; },
+        @"engageDeviceNFC": ^{ [self engageDeviceNFC :callback]; },
+        @"engageDeviceData": ^{ [self engageDeviceData :args[0] :callback]; },
+        @"startRetrieveData": ^{ [self startRetrieveData :args[0] :args[1] :callback]; },
+        @"retrieveDataNFC": ^{ [self retrieveDataNFC :args[0] :callback]; },
+        @"retrieveDataBLE": ^{ [self retrieveDataBLE :args[0] :args[0] :callback]; },
         @"setLocalizationDictionary": ^{ [self setLocalizationDictionary :args[0]]; },
         @"getLicense": ^{ [self getLicense :callback]; },
         @"getAvailableScenarios": ^{ [self getAvailableScenarios :callback]; },
@@ -357,6 +364,48 @@ RGLWCallback savedCallbackForBluetoothResult;
     [bluetooth disconnect];
 }
 
++(void)startReadMDl:(NSNumber*)type :(NSDictionary*)dataRetrieval :(RGLWCallback)callback {
+    [RGLDocReader.shared startReadMDLFromPresenter:RGLWRootViewController() engagementType:[type integerValue] dataRetrieval:[RGLWJSONConstructor dataRetrievalFromJson:dataRetrieval] completion:^(RGLDocReaderAction action, RGLDocumentReaderResults * _Nullable results, NSError * _Nullable error) {
+        callback([RGLWJSONConstructor generateCompletion:[RGLWConfig generateDocReaderAction: action] :results :error]);
+    }];
+}
+
++(void)startEngageDevice:(NSNumber*)type :(RGLWCallback)callback {
+    [RGLDocReader.shared startEngageDeviceFromPresenter:RGLWRootViewController() type:[type integerValue] completion:^(RGLDeviceEngagement* deviceEngagement, NSError* error) {
+        callback([RGLWJSONConstructor generateDeviceEngagementCompletion:deviceEngagement :error]);
+    }];
+}
+
++(void)engageDeviceNFC:(RGLWCallback)callback {
+    [RGLDocReader.shared engageDeviceNFC:RGLWRootViewController() completion:^(RGLDeviceEngagement * _Nullable deviceEngagement, NSError * _Nullable error) {
+        callback([RGLWJSONConstructor generateDeviceEngagementCompletion:deviceEngagement :error]);
+    }];
+}
+
++(void)engageDeviceData:(NSString*)data :(RGLWCallback)callback {
+    [RGLDocReader.shared engageDeviceData:data completion:^(RGLDeviceEngagement * _Nullable deviceEngagement, NSError * _Nullable error) {
+        callback([RGLWJSONConstructor generateDeviceEngagementCompletion:deviceEngagement :error]);
+    }];
+}
+
++(void)startRetrieveData:(NSDictionary*)dataRetrieval :(NSDictionary*)deviceEngagement :(RGLWCallback)callback {
+    [RGLDocReader.shared startRetrieveData:[RGLWJSONConstructor deviceEngagementFromJson:deviceEngagement] dataRetrieval:[RGLWJSONConstructor dataRetrievalFromJson:dataRetrieval] completion:^(RGLDocReaderAction action, RGLDocumentReaderResults * _Nullable results, NSError * _Nullable error) {
+        callback([RGLWJSONConstructor generateCompletion:[RGLWConfig generateDocReaderAction: action] :results :error]);
+    }];
+}
+
++(void)retrieveDataNFC:(NSDictionary*)dataRetrieval :(RGLWCallback)callback {
+    [RGLDocReader.shared retrieveDataNFC:[RGLWJSONConstructor dataRetrievalFromJson:dataRetrieval] completion:^(RGLDocReaderAction action, RGLDocumentReaderResults * _Nullable results, NSError * _Nullable error) {
+        callback([RGLWJSONConstructor generateCompletion:[RGLWConfig generateDocReaderAction: action] :results :error]);
+    }];
+}
+
++(void)retrieveDataBLE:(NSDictionary*)dataRetrieval :(NSDictionary*)deviceEngagement :(RGLWCallback)callback {
+    [RGLDocReader.shared retrieveDataBLE:[RGLWJSONConstructor deviceEngagementFromJson:deviceEngagement] dataRetrieval:[RGLWJSONConstructor dataRetrievalFromJson:dataRetrieval] completion:^(RGLDocReaderAction action, RGLDocumentReaderResults * _Nullable results, NSError * _Nullable error) {
+        callback([RGLWJSONConstructor generateCompletion:[RGLWConfig generateDocReaderAction: action] :results :error]);
+    }];
+}
+
 +(void)setLocalizationDictionary:(NSDictionary*)dictionary {
     RGLDocReader.shared.localizationHandler = ^NSString * _Nullable(NSString * _Nonnull localizationKey) {
         if(dictionary != nil && ![dictionary isEqual:[NSNull null]] && [dictionary valueForKey:localizationKey] != nil)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@regulaforensics/document-reader",
-  "version": "9.1.484-rc",
+  "version": "9.1.493-beta",
   "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",

package/plugin.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="@regulaforensics/document-reader" version="9.1.484-rc" xmlns="http://apache.org/cordova/ns/plugins/1.0">
+<plugin id="@regulaforensics/document-reader" version="9.1.493-beta" xmlns="http://apache.org/cordova/ns/plugins/1.0">
   <name>DocumentReader</name>
   <description>Cordova plugin for Regula Document Reader SDK</description>
   <license>commercial</license>
@@ -29,7 +29,7 @@
         <source url="https://github.com/CocoaPods/Specs.git" />
       </config>
       <pods>
-        <pod name="DocumentReaderStage" spec="9.1.5661" />
+        <pod name="DocumentReaderBeta" spec="9.1.5681" />
       </pods>
     </podspec>
   </platform>