dynamsoft-capture-vision-react-native 3.0.5200 → 3.2.3000

package/ios/RNDynamsoftCaptureVisionRouter.mm

@@ -51,6 +51,28 @@ RCT_EXPORT_MODULE(DynamsoftCaptureVisionRouterModule)
     _cvr = nil;
 }
 
+RCT_EXPORT_METHOD(setGlobalIntraOpNumThreads:(NSInteger)intraOpNumThreads) {
+    [DSCaptureVisionRouter setGlobalIntraOpNumThreads:intraOpNumThreads];
+}
+
+RCT_EXPORT_METHOD(clearDLModelBuffers) {
+    [DSCaptureVisionRouter clearDLModelBuffers];
+}
+
+RCT_EXPORT_METHOD(switchCapturingTemplate:(NSString *)templateName
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  rejecter: (RCTPromiseRejectBlock)reject)
+{
+    NSError *error = nil;
+    [self.cvr switchCapturingTemplate:templateName error:&error];
+    if (error) {
+        NSString *code = [NSString stringWithFormat:@"%ld",(long)error.code];
+        reject(code, error.localizedDescription, error);
+    } else {
+        resolve(@(true));
+    }
+}
+
 RCT_EXPORT_METHOD(startCapturing:(NSString *)templateName
                   resolve:(RCTPromiseResolveBlock)resolve
                   rejecter: (RCTPromiseRejectBlock)reject)
@@ -333,7 +355,8 @@ RCT_EXPORT_METHOD(removeFilter:(NSString *)key) {
     return [[self.cvr getIntermediateResultManager] getOriginalImage:imageHashId];
 }
 
-#pragma mark - global
+#pragma mark - Global JSI
+// --- RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install) ---
 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install)
 {
     RCTBridge* bridge = [RCTBridge currentBridge];
@@ -350,110 +373,144 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install)
     return @true;
 }
 
+// --- Helper Functions and Macros ---
+static void installHostFunction(
+    jsi::Runtime &jsiRuntime,
+    const char* name,
+    size_t argCount,
+    HostFunctionType hostFunction) {
+    
+    auto func = Function::createFromHostFunction(
+        jsiRuntime,
+        PropNameID::forAscii(jsiRuntime, name),
+        argCount,
+        std::move(hostFunction)
+    );
+    jsiRuntime.global().setProperty(jsiRuntime, name, std::move(func));
+}
+
+// --- JSI Installation Logic ---
 static void install(jsi::Runtime &jsiRuntime, RNDynamsoftCaptureVisionRouter *rnCapture) {
-    const char* captureImageData = "captureImageData";
-    auto captureImageDataFunc = Function::createFromHostFunction(jsiRuntime,
-                                                                 PropNameID::forAscii(jsiRuntime,captureImageData),
-                                                                 2,
-                                                                 [rnCapture](Runtime &runtime,
-                                                                             const Value &thisValue,
-                                                                             const Value *arguments,
-                                                                             size_t count) -> Value {
-        NSString *name = convertJSIStringToNSString(runtime, arguments[1].getString(runtime));
-        Object obj = arguments[0].getObject(runtime);
-        if (obj.isHostObject<ImageDataHostObject>(runtime)) {
-            ImageDataHostObject hostObject = ImageDataHostObject::getHOFromObject(runtime, std::move(obj));
-            DSImageData *data = [DSImageData imageDataFromHostObject:hostObject];
-            DSCapturedResult *result = [rnCapture.cvr captureFromBuffer:data templateName:name];
+
+    // 1. captureImageData(imageDataHostObject, templateName)
+    installHostFunction(jsiRuntime, "captureImageData", 2,
+        [rnCapture](Runtime &runtime, const Value &thisValue, const Value *arguments, size_t count) -> Value {
+            // Argument check
+            if (count != 2 || !arguments[1].isString() || !arguments[0].isObject()) {
+                return Value(false); // Or throw a JSI exception
+            }
+
+            NSString *name = convertJSIStringToNSString(runtime, arguments[1].getString(runtime));
+            Object obj = arguments[0].getObject(runtime);
+
+            if (obj.isHostObject<ImageDataHostObject>(runtime)) {
+                // Assuming ImageDataHostObject::getHOFromObject returns a non-owning copy or reference
+                ImageDataHostObject hostObject = ImageDataHostObject::getHOFromObject(runtime, obj);
+                
+                // Get the Objective-C object from the HostObject
+                DSImageData *data = [DSImageData imageDataFromHostObject:hostObject];
+                
+                DSCapturedResult *result = [rnCapture.cvr captureFromBuffer:data templateName:name];
+                return [result convertToJSIObject:runtime];
+            }
+            return Value(false);
+        }
+    );
+
+    // 2. captureFile(filePath, templateName)
+    installHostFunction(jsiRuntime, "captureFile", 2,
+        [rnCapture](Runtime &runtime, const Value &thisValue, const Value *arguments, size_t count) -> Value {
+            // Argument check
+            if (count != 2 || !arguments[0].isString() || !arguments[1].isString()) {
+                return Value(false);
+            }
+            
+            NSString *file = convertJSIStringToNSString(runtime, arguments[0].getString(runtime));
+            NSString *name = convertJSIStringToNSString(runtime, arguments[1].getString(runtime));
+            
+            DSCapturedResult *result = [rnCapture.cvr captureFromFile:file templateName:name];
             return [result convertToJSIObject:runtime];
         }
-        return Value(false);
-    });
-    jsiRuntime.global().setProperty(jsiRuntime, captureImageData, std::move(captureImageDataFunc));
-    
-    const char* captureFile = "captureFile";
-    auto captureFileFunc = Function::createFromHostFunction(jsiRuntime,
-                                                            PropNameID::forAscii(jsiRuntime, captureFile),
-                                                            2,
-                                                            [rnCapture](Runtime &runtime,
-                                                                        const Value &thisValue,
-                                                                        const Value *arguments,
-                                                                        size_t count) -> Value {
-        NSString *file = convertJSIStringToNSString(runtime, arguments[0].getString(runtime));
-        NSString *name = convertJSIStringToNSString(runtime, arguments[1].getString(runtime));
-        DSCapturedResult *result = [rnCapture.cvr captureFromFile:file templateName:name];
-        return [result convertToJSIObject:runtime];
-    });
-    jsiRuntime.global().setProperty(jsiRuntime, captureFile, std::move(captureFileFunc));
-    
-    const char* captureFileBytes = "captureFileBytes";
-    auto captureFileBytesFunc = Function::createFromHostFunction(jsiRuntime,
-                                                                 PropNameID::forAscii(jsiRuntime, captureFileBytes),
-                                                                 2,
-                                                                 [rnCapture](Runtime &runtime,
-                                                                             const Value &thisValue,
-                                                                             const Value *arguments,
-                                                                             size_t count) -> Value {
-        ArrayBuffer buffer = arguments[0].asObject(runtime).getArrayBuffer(runtime);
-        NSData *data = convertArrayBufferToNSData(runtime, buffer);
-         NSString *name = convertJSIStringToNSString(runtime, arguments[1].getString(runtime));
-         DSCapturedResult *result = [rnCapture.cvr captureFromFileBytes:data templateName:name];
-         return [result convertToJSIObject:runtime];
-     });
-     jsiRuntime.global().setProperty(jsiRuntime, captureFileBytes, std::move(captureFileBytesFunc));
+    );
+
+    // 3. captureFileBytes(arrayBuffer, templateName)
+    installHostFunction(jsiRuntime, "captureFileBytes", 2,
+        [rnCapture](Runtime &runtime, const Value &thisValue, const Value *arguments, size_t count) -> Value {
+            // Argument check
+            if (count != 2 || !arguments[0].isObject() || !arguments[1].isString()) {
+                return Value(false);
+            }
+            
+            Object obj = arguments[0].asObject(runtime);
+            if (!obj.isArrayBuffer(runtime)) {
+                return Value(false);
+            }
+            
+            ArrayBuffer buffer = obj.getArrayBuffer(runtime);
+            NSData *data = convertArrayBufferToNSData(runtime, buffer);
+            NSString *name = convertJSIStringToNSString(runtime, arguments[1].getString(runtime));
+            
+            DSCapturedResult *result = [rnCapture.cvr captureFromFileBytes:data templateName:name];
+            return [result convertToJSIObject:runtime];
+        }
+    );
     
-    const char* getCurrentDeskewedImages = "getCurrentDeskewedImages";
-    auto getCurrentDeskewedImagesFunc = Function::createFromHostFunction(jsiRuntime,
-                                                                           PropNameID::forAscii(jsiRuntime, getCurrentDeskewedImages),
-                                                                           0,
-                                                                           [rnCapture](Runtime &runtime,
-                                                                                       const Value &thisValue,
-                                                                                       const Value *arguments,
-                                                                                       size_t count) -> Value {
-        NSMutableArray<DSImageData *> *imageDataArray = rnCapture.deskewedImageDataArray;
+    // --- Image Data Array Accessors ---
+
+    // Generic lambda for getting a list of images (deskewed or enhanced)
+    auto getImageArrayFunc = [rnCapture](Runtime &runtime, NSArray<DSImageData *> *imageDataArray) -> Value {
         Array array(runtime, imageDataArray.count);
         for (int i = 0; i < imageDataArray.count; i++) {
+            // Create a new JSI Host Object wrapping the existing Objective-C object's data
+            // This assumes ImageDataHostObject has a suitable constructor/initialization.
             ImageDataHostObject hostObject = [[imageDataArray objectAtIndex:i] hostObject];
             Object obj = Object::createFromHostObject(runtime, std::make_shared<ImageDataHostObject>(hostObject));
             array.setValueAtIndex(runtime, i, obj);
         }
         return array;
-    });
-    jsiRuntime.global().setProperty(jsiRuntime, getCurrentDeskewedImages, std::move(getCurrentDeskewedImagesFunc));
-    
-    const char* getCurrentEnhancedImages = "getCurrentEnhancedImages";
-    auto getCurrentEnhancedImagesFunc = Function::createFromHostFunction(jsiRuntime,
-                                                                           PropNameID::forAscii(jsiRuntime, getCurrentEnhancedImages),
-                                                                           0,
-                                                                           [rnCapture](Runtime &runtime,
-                                                                                       const Value &thisValue,
-                                                                                       const Value *arguments,
-                                                                                       size_t count) -> Value {
-        NSMutableArray<DSImageData *> *imageDataArray = rnCapture.enhancedImageDataArray;
-        Array array(runtime, imageDataArray.count);
-        for (int i = 0; i < imageDataArray.count; i++) {
-            ImageDataHostObject hostObject = [[imageDataArray objectAtIndex:i] hostObject];
+    };
+
+    // 4. getCurrentDeskewedImages()
+    installHostFunction(jsiRuntime, "getCurrentDeskewedImages", 0,
+        [rnCapture, getImageArrayFunc](Runtime &runtime, const Value &thisValue, const Value *arguments, size_t count) -> Value {
+            if (count != 0) {
+                return Value(Array(runtime, 0));
+            }
+            return getImageArrayFunc(runtime, rnCapture.deskewedImageDataArray);
+        }
+    );
+
+    // 5. getCurrentEnhancedImages()
+    installHostFunction(jsiRuntime, "getCurrentEnhancedImages", 0,
+        [rnCapture, getImageArrayFunc](Runtime &runtime, const Value &thisValue, const Value *arguments, size_t count) -> Value {
+            if (count != 0) {
+                return Value(Array(runtime, 0));
+            }
+            return getImageArrayFunc(runtime, rnCapture.enhancedImageDataArray);
+        }
+    );
+
+    // 6. cvr_getOriginalImage(imageHashId)
+    installHostFunction(jsiRuntime, "cvr_getOriginalImage", 1,
+        [rnCapture](Runtime &runtime, const Value &thisValue, const Value *arguments, size_t count) -> Value {
+            // Argument check
+            if (count != 1 || !arguments[0].isString()) {
+                return Value::null(); // Or Value(false) depending on expected JS behavior
+            }
+            
+            NSString *imageHashId = convertJSIStringToNSString(runtime, arguments[0].getString(runtime));
+            
+            DSImageData *imageData = [rnCapture getOriginalImage:imageHashId];
+            if (imageData == nil) {
+                return Value::null();
+            }
+            
+            ImageDataHostObject hostObject = [imageData hostObject];
+            // Create a new JSI Host Object wrapper
             Object obj = Object::createFromHostObject(runtime, std::make_shared<ImageDataHostObject>(hostObject));
-            array.setValueAtIndex(runtime, i, obj);
+            return obj;
         }
-        return array;
-    });
-    jsiRuntime.global().setProperty(jsiRuntime, getCurrentEnhancedImages, std::move(getCurrentEnhancedImagesFunc));
-    
-    const char* getOriginalImage = "cvr_getOriginalImage";
-    auto getOriginalImageFunc = Function::createFromHostFunction(jsiRuntime,
-                                                                 PropNameID::forAscii(jsiRuntime, getOriginalImage),
-                                                                 1,
-                                                                 [rnCapture](Runtime &runtime,
-                                                                             const Value &thisValue,
-                                                                             const Value *arguments,
-                                                                             size_t count) -> Value {
-        NSString *imageHashId = convertJSIStringToNSString(runtime, arguments[0].getString(runtime));
-        ImageDataHostObject hostObject = [[rnCapture getOriginalImage:imageHashId] hostObject];
-        Object obj = Object::createFromHostObject(runtime, std::make_shared<ImageDataHostObject>(hostObject));
-        return obj;
-    });
-    jsiRuntime.global().setProperty(jsiRuntime, getOriginalImage, std::move(getOriginalImageFunc));
+    );
 }
 
 @end

package/ios/RNDynamsoftImageEditorViewManager.mm

@@ -81,7 +81,29 @@ RCT_EXPORT_METHOD(getSelectedQuad:(nonnull NSNumber *)tag
      }];
 }
 
-#pragma mark - Global
+- (void)trySetImageDataWithTag:(nonnull NSNumber *)tag data:(DSImageData *)data attempt:(NSInteger)attempt {
+    const NSInteger maxAttempts = 10;
+    const NSTimeInterval retryDelay = 0.1; // 100ms
+
+    [self.bridge.uiManager addUIBlock:
+     ^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+         id view = viewRegistry[tag];
+         if (!view || ![view isKindOfClass:[RNDynamsoftImageEditorView class]]) {
+             if (attempt < maxAttempts) {
+                 dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(retryDelay * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                     [self trySetImageDataWithTag:tag data:data attempt:1];
+                 });
+             } else {
+                 RCTLogError(@"Cannot find RNDynamsoftImageEditorView with tag #%@ after %ld attempts", tag, (long)attempt);
+             }
+         } else {
+             ((RNDynamsoftImageEditorView *)view).editorView.imageData = data;
+         }
+     }];
+}
+
+#pragma mark - Global JSI
+// --- RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install) ---
 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install)
 {
     RCTBridge* bridge = [RCTBridge currentBridge];
@@ -98,49 +120,58 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install)
     return @true;
 }
 
-static void install(jsi::Runtime &jsiRuntime, RNDynamsoftImageEditorViewManager *rnEditorViewManager) {
-    const char* setOriginalImage = "editorView_setOriginalImage";
-    auto setOriginalImageFunc = Function::createFromHostFunction(jsiRuntime,
-                                                                 PropNameID::forAscii(jsiRuntime, setOriginalImage),
-                                                                 2,
-                                                                 [rnEditorViewManager](Runtime &runtime,
-                                                                                       const Value &thisValue,
-                                                                                       const Value *arguments,
-                                                                                       size_t count) -> Value {
-        
-        double tag = arguments[0].getNumber();
-        Object obj = arguments[1].getObject(runtime);
-        if (obj.isHostObject<ImageDataHostObject>(runtime)) {
-            ImageDataHostObject hostObject = ImageDataHostObject::getHOFromObject(runtime, std::move(obj));
-            DSImageData *data = [DSImageData imageDataFromHostObject:hostObject];
-            [rnEditorViewManager trySetImageDataWithTag:@(tag) data:data attempt:1];
-            return Value(true);
-        }
-        return Value(false);
-    });
+// --- Helper Function (Assumed to be accessible, copied here for completeness) ---
+static void installHostFunction(
+    jsi::Runtime &jsiRuntime,
+    const char* name,
+    size_t argCount,
+    HostFunctionType hostFunction) {
     
-    jsiRuntime.global().setProperty(jsiRuntime, setOriginalImage, std::move(setOriginalImageFunc));
+    auto func = Function::createFromHostFunction(
+        jsiRuntime,
+        PropNameID::forAscii(jsiRuntime, name),
+        argCount,
+        std::move(hostFunction)
+    );
+    jsiRuntime.global().setProperty(jsiRuntime, name, std::move(func));
 }
 
-- (void)trySetImageDataWithTag:(nonnull NSNumber *)tag data:(DSImageData *)data attempt:(NSInteger)attempt {
-    const NSInteger maxAttempts = 10;
-    const NSTimeInterval retryDelay = 0.1; // 100ms
+// --- JSI Installation Logic ---
+static void install(jsi::Runtime &jsiRuntime, RNDynamsoftImageEditorViewManager *rnEditorViewManager) {
 
-    [self.bridge.uiManager addUIBlock:
-     ^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-         id view = viewRegistry[tag];
-         if (!view || ![view isKindOfClass:[RNDynamsoftImageEditorView class]]) {
-             if (attempt < maxAttempts) {
-                 dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(retryDelay * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                     [self trySetImageDataWithTag:tag data:data attempt:1];
-                 });
-             } else {
-                 RCTLogError(@"Cannot find RNDynamsoftImageEditorView with tag #%@ after %ld attempts", tag, (long)attempt);
-             }
-         } else {
-             ((RNDynamsoftImageEditorView *)view).editorView.imageData = data;
-         }
-     }];
+    // 1. editorView_setOriginalImage(viewTag, imageDataHostObject)
+    installHostFunction(jsiRuntime, "editorView_setOriginalImage", 2,
+        [rnEditorViewManager](Runtime &runtime, const Value &thisValue, const Value *arguments, size_t count) -> Value {
+            
+            // 🔍 Argument Validation & Type Check (Optimized)
+            if (count != 2 || !arguments[0].isNumber() || !arguments[1].isObject()) {
+                // Should potentially throw an exception for incorrect usage,
+                // but returning Value(false) keeps it consistent with original code style.
+                return Value(false);
+            }
+
+            // Extract View Tag (JS number)
+            double tag = arguments[0].getNumber();
+            NSNumber *viewTag = @(tag); // Convert to NSNumber for Objective-C method
+
+            // Extract Image Data Host Object (Requires runtime for getObject)
+            Object obj = arguments[1].getObject(runtime);
+            
+            // Check if it's the specific Host Object type (Requires runtime for isHostObject)
+            if (obj.isHostObject<ImageDataHostObject>(runtime)) {
+                // Safely convert Host Object to DSImageData
+                ImageDataHostObject hostObject = ImageDataHostObject::getHOFromObject(runtime, obj);
+                DSImageData *data = [DSImageData imageDataFromHostObject:hostObject];
+                
+                // Call the Objective-C View Manager method
+                [rnEditorViewManager trySetImageDataWithTag:viewTag data:data attempt:1];
+                
+                return Value(true);
+            }
+            
+            return Value(false);
+        }
+    );
 }
 
 @end