@microblink/blinkid-react-native 7.5.0 → 7.6.0

package/ios/BlinkidReactNative.mm

@@ -33,7 +33,7 @@ RCT_EXPORT_MODULE()
     return dict;
 }
 
-- (void)performScan:(NSString *)blinkIdSdkSettings blinkIdSessionSettings:(NSString *)blinkIdSessionSettings blinkIdUiSettings:(NSString *)blinkIdUiSettings classFilter:(NSString *)classFilter resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
+- (void)performScan:(nonnull NSString *)blinkIdSdkSettings blinkIdSessionSettings:(nonnull NSString *)blinkIdSessionSettings blinkIdScanningUxSettings:(nonnull NSString *)blinkIdScanningUxSettings classFilter:(nonnull NSString *)classFilter resolve:(nonnull RCTPromiseResolveBlock)resolve reject:(nonnull RCTPromiseRejectBlock)reject {
     
     dispatch_async(dispatch_get_main_queue(), ^{
         UIWindow *keyWindow = nil;
@@ -55,10 +55,10 @@ RCT_EXPORT_MODULE()
         
         [self->moduleImplementation
          performScan:keyWindow.rootViewController
-         blinkIdSdkSettings:[self createDictionaryFromBlinkIdObject: blinkIdSdkSettings]
-         blinkIdSessionSettings:[self createDictionaryFromBlinkIdObject: blinkIdSessionSettings]
-         blinkIdUiSettings:[self createDictionaryFromBlinkIdObject:blinkIdUiSettings]
-         classFilterSettings:[self createDictionaryFromBlinkIdObject: classFilter]
+         blinkIdSdkSettings:[self createDictionaryFromBlinkIdObject:blinkIdSdkSettings]
+         blinkIdSessionSettings:[self createDictionaryFromBlinkIdObject:blinkIdSessionSettings]
+         blinkIdScanningUxSettings:[self createDictionaryFromBlinkIdObject:blinkIdScanningUxSettings]
+         classFilterSettings:[self createDictionaryFromBlinkIdObject:classFilter]
          onResolve:^(NSString * _Nonnull result) {
             resolve(@[result]);
         } onReject:^(NSString * _Nonnull error) {
@@ -81,7 +81,22 @@ RCT_EXPORT_MODULE()
     }];
 }
 
+- (void)loadBlinkIdSdk:(nonnull NSString *)blinkIdSdkSettings resolve:(nonnull RCTPromiseResolveBlock)resolve reject:(nonnull RCTPromiseRejectBlock)reject {
+    [self->moduleImplementation loadSdk:[self createDictionaryFromBlinkIdObject:blinkIdSdkSettings] onResolve:^(NSString * _Nonnull) {
+        resolve(@"");
+    } onReject:^(NSString * _Nonnull error) {
+        reject(@"BlinkIdIosError", error, nil);
+    }];
+}
+
 
+- (void)unloadBlinkIdSdk:(BOOL)deleteCachedResources resolve:(nonnull RCTPromiseResolveBlock)resolve reject:(nonnull RCTPromiseRejectBlock)reject {
+    [self->moduleImplementation unloadSdk:deleteCachedResources onResolve:^(NSString * _Nonnull) {
+        resolve(@"");
+    } onReject:^(NSString * _Nonnull error) {
+        reject(@"BlinkIdIosError", error, nil);
+    }];
+}
 
 - (NSDictionary *)createDictionaryFromBlinkIdObject:(NSString *)jsonString {
     NSError *jsonError;

package/ios/BlinkidReactNativeModule.swift

@@ -17,40 +17,68 @@ import BlinkIDUX
     private var cancellables = Set<AnyCancellable>()
     private var classFilterDict: [String: Any]?
     
-    @objc public func performScan(_ rootVc: UIViewController, blinkIdSdkSettings: [String: Any], blinkIdSessionSettings: [String: Any], blinkIdUiSettings: [String: Any], classFilterSettings: [String: Any], onResolve: @escaping (String) -> Void, onReject: @escaping (String) -> Void) {
+    private var blinkIdSdk: BlinkIDSdk?
+    
+    @objc public func loadSdk(_ blinkIdSdkSettings: [String: Any], onResolve: @escaping (String) -> Void, onReject: @escaping (String) -> Void) {
+        Task {
+            do {
+                let _ = try await ensureLoadedSdk(blinkIdSdkSettings)
+                onResolve("")
+            } catch {
+                onReject(error.localizedDescription)
+            }
+        }
+    }
+    
+    private func ensureLoadedSdk(_ blinkIdSdkSettings: [String: Any]) async throws -> BlinkIDSdk? {
+        if let blinkIdSdk = blinkIdSdk { return blinkIdSdk }
+        do {
+            guard let settings = BlinkIdDeserializationUtilities.deserializeBlinkIdSdkSettings(blinkIdSdkSettings) else { throw BlinkIdReactNativeError.incorrectArgument(message: "Incorrect BlinkID SDK settings!") }
+            blinkIdSdk = try await BlinkIDSdk.createBlinkIDSdk(withSettings: settings)
+            return blinkIdSdk
+        } catch {
+            blinkIdSdk = nil
+            throw error
+        }
+        return nil
+    }
+    
+    @objc public func unloadSdk(_ deleteCachedResources: Bool, onResolve: @escaping (String) -> Void, onReject: @escaping (String) -> Void) {
+        Task {
+            if deleteCachedResources {
+               await BlinkIDSdk.terminateBlinkIDSdkAndDeleteCachedResources()
+            } else {
+                await BlinkIDSdk.terminateBlinkIDSdk()
+            }
+            blinkIdSdk = nil
+            onResolve("")
+        }
+    }
+    
+    @objc public func performScan(_ rootVc: UIViewController, blinkIdSdkSettings: [String: Any], blinkIdSessionSettings: [String: Any], blinkIdScanningUxSettings: [String: Any], classFilterSettings: [String: Any], onResolve: @escaping (String) -> Void, onReject: @escaping (String) -> Void) {
         Task {
             do {
                 
-                guard let sdkSettings = BlinkIdDeserializationUtilities.deserializeBlinkIdSdkSettings(blinkIdSdkSettings) else {
-                    onReject("Could not initialize the SDK!")
+                blinkIdSdk = try await ensureLoadedSdk(blinkIdSdkSettings)
+                guard let blinkIdSdk = blinkIdSdk else {
+                    onReject("The SDK is not loaded!")
                     return
                 }
-                
                 let sessionSettings = BlinkIdDeserializationUtilities.deserializeBlinkIdSessionSettings(blinkIdSessionSettings)
                 classFilterDict = classFilterSettings
                 
-                let sdkInstance = try await BlinkIDSdk.createBlinkIDSdk(withSettings: sdkSettings)
                 let analyzer = try await BlinkIDAnalyzer(
-                    sdk: sdkInstance,
+                    sdk: blinkIdSdk,
                     blinkIdSessionSettings: sessionSettings,
                     eventStream: BlinkIDEventStream(),
                     classFilter: self
                 )
                 await addReactNativePinglet(with: analyzer.sessionNumber)
                 
-                var shouldShowIntroductionAlert = true
-                if let showOnboardingDialog = blinkIdUiSettings["showOnboardingDialog"] as? Bool {
-                    shouldShowIntroductionAlert = showOnboardingDialog
-                }
-                var shouldShowHelpButton = true
-                if let showHelpButton = blinkIdUiSettings["showHelpButton"] as? Bool {
-                    shouldShowHelpButton = showHelpButton
-                }
-                
                 let scanningUxModel = await BlinkIDUXModel(
                     analyzer: analyzer,
-                    shouldShowIntroductionAlert: shouldShowIntroductionAlert,
-                    showHelpButton: shouldShowHelpButton, sessionNumber: analyzer.sessionNumber)
+                    uxSettings: BlinkIdDeserializationUtilities.deserializeBlinkIdUxScanningSettings(blinkIdScanningUxSettings),
+                    sessionNumber: analyzer.sessionNumber)
                 
                 await scanningUxModel.$result
                     .sink { [weak self] scanningResultState in
@@ -91,16 +119,15 @@ import BlinkIDUX
     @objc public func performDirectApiScan(blinkIdSdkSettings: [String: Any], blinkIdSessionSettings: [String: Any], firstImage: String, secondImage: String?, onResolve: @escaping (String) -> Void, onReject: @escaping (String) -> Void) {
         Task{
             do {
-                guard let sdkSettings = BlinkIdDeserializationUtilities.deserializeBlinkIdSdkSettings(blinkIdSdkSettings) else {
-                    onReject("Could not initialize the SDK!")
+                blinkIdSdk = try await ensureLoadedSdk(blinkIdSdkSettings)
+                guard let blinkIdSdk = blinkIdSdk else {
+                    onReject("The BlinkID SDK is not initialized!")
                     return
                 }
-                
                 var sessionSettings = BlinkIdDeserializationUtilities.deserializeBlinkIdSessionSettings(blinkIdSessionSettings)
                 sessionSettings.inputImageSource = .photo
                 
-                let blinkidSdk = try await BlinkIDSdk.createBlinkIDSdk(withSettings: sdkSettings)
-                let session = try await blinkidSdk.createScanningSession(sessionSettings: sessionSettings)
+                let session = try await blinkIdSdk.createScanningSession(sessionSettings: sessionSettings)
                 
                 await addReactNativePinglet(with: session.getSessionNumber())
                 
@@ -147,6 +174,10 @@ import BlinkIDUX
     }
 }
 
+enum BlinkIdReactNativeError: Error {
+    case incorrectArgument(message: String)
+}
+
 extension BlinkidReactNativeModule: BlinkIDClassFilter {
     public func classAllowed(classInfo: BlinkID.BlinkIDSDK.DocumentClassInfo) -> Bool {
         if let classInfoFilterDict = classFilterDict {

package/ios/Frameworks/BlinkID.xcframework/Info.plist

@@ -8,32 +8,32 @@
 			<key>BinaryPath</key>
 			<string>BlinkID.framework/BlinkID</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>BlinkID.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>BlinkID.framework/BlinkID</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>BlinkID.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>