react-native-rectangle-doc-scanner 3.109.0 → 3.110.0

package/dist/FullDocScanner.js

@@ -45,7 +45,6 @@ const react_native_fs_1 = __importDefault(require("react-native-fs"));
 const DocScanner_1 = require("./DocScanner");
 let ImageManipulator = null;
 let ImageRotate = null;
-const ImageStoreManager = react_native_1.NativeModules.ImageStoreManager;
 try {
     ImageManipulator = require('expo-image-manipulator');
 }
@@ -65,24 +64,6 @@ const isImageRotateAvailable = !!ImageRotate?.rotateImage;
 const isImageRotationSupported = () => isExpoImageManipulatorAvailable() || isImageRotateAvailable;
 const stripFileUri = (value) => value.replace(/^file:\/\//, '');
 const ensureFileUri = (value) => (value.startsWith('file://') ? value : `file://${value}`);
-const getBase64FromImageStore = async (uri) => {
-    const getBase64ForTag = ImageStoreManager?.getBase64ForTag?.bind(ImageStoreManager);
-    if (!getBase64ForTag) {
-        throw new Error('ImageStoreManager.getBase64ForTag unavailable');
-    }
-    return new Promise((resolve, reject) => {
-        getBase64ForTag(uri, (base64) => resolve(base64), (error) => {
-            const message = typeof error === 'string'
-                ? error
-                : error && typeof error === 'object' && 'message' in error
-                    ? String(error.message)
-                    : 'Failed to read from ImageStore';
-            reject(new Error(message));
-        });
-    }).finally(() => {
-        ImageStoreManager?.removeImageForTag?.(uri);
-    });
-};
 const CROPPER_TIMEOUT_MS = 8000;
 const CROPPER_TIMEOUT_CODE = 'cropper_timeout';
 const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
@@ -418,8 +399,9 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
         if (!croppedImageData) {
             return;
         }
-        // 회전이 없거나 모듈을 사용할 수 없으면 기존 데이터 그대로 전달
+        // 회전이 없으면 기존 데이터 그대로 전달
         if (rotationDegrees === 0) {
+            console.log('[FullDocScanner] No rotation, returning original image');
             onResult({
                 path: croppedImageData.path,
                 base64: croppedImageData.base64,
@@ -430,74 +412,103 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
             setProcessing(true);
             // 회전 각도 정규화 (0, 90, 180, 270)
             const rotationNormalized = ((rotationDegrees % 360) + 360) % 360;
+            console.log('[FullDocScanner] Rotation degrees:', rotationDegrees, 'normalized:', rotationNormalized);
             if (rotationNormalized === 0) {
+                console.log('[FullDocScanner] Normalized to 0, returning original image');
                 onResult({
                     path: croppedImageData.path,
                     base64: croppedImageData.base64,
                 });
+                setProcessing(false);
                 return;
             }
+            // expo-image-manipulator 시도
             if (isExpoImageManipulatorAvailable() && ImageManipulator?.manipulateAsync) {
                 try {
-                    // expo-image-manipulator로 이미지 회전
-                    const result = await ImageManipulator.manipulateAsync(croppedImageData.path, [{ rotate: rotationNormalized }], {
+                    console.log('[FullDocScanner] Using expo-image-manipulator for rotation');
+                    const inputUri = ensureFileUri(croppedImageData.path);
+                    const result = await ImageManipulator.manipulateAsync(inputUri, [{ rotate: rotationNormalized }], {
                         compress: 0.9,
                         format: ImageManipulator.SaveFormat.JPEG,
                         base64: true,
                     });
-                    onResult({
+                    console.log('[FullDocScanner] Rotation complete via expo-image-manipulator:', {
                         path: result.uri,
+                        hasBase64: !!result.base64,
+                    });
+                    onResult({
+                        path: stripFileUri(result.uri),
                         base64: result.base64,
                     });
+                    setProcessing(false);
                     return;
                 }
                 catch (manipulatorError) {
                     const code = manipulatorError && typeof manipulatorError === 'object' && 'code' in manipulatorError
                         ? String(manipulatorError.code)
                         : undefined;
+                    console.error('[FullDocScanner] expo-image-manipulator error:', manipulatorError);
                     if (code === 'ERR_UNAVAILABLE') {
                         expoManipulatorUnavailable = true;
-                        console.warn('[FullDocScanner] expo-image-manipulator unavailable at runtime. Falling back to react-native-image-rotate if possible.');
+                        console.warn('[FullDocScanner] expo-image-manipulator unavailable at runtime. Trying react-native-image-rotate.');
                     }
                     else {
                         throw manipulatorError;
                     }
                 }
             }
+            // react-native-image-rotate 시도 (ImageStore 사용 안 함)
             if (isImageRotateAvailable && ImageRotate?.rotateImage) {
+                console.log('[FullDocScanner] Using react-native-image-rotate for rotation');
                 const sourceUri = ensureFileUri(croppedImageData.path);
-                const rotatedUri = await rotateImageWithFallback(sourceUri, rotationNormalized);
-                let finalPath = croppedImageData.path;
-                let base64Result = croppedImageData.base64;
                 try {
-                    const base64FromStore = await getBase64FromImageStore(rotatedUri);
-                    const destinationPath = `${react_native_fs_1.default.CachesDirectoryPath}/full-doc-scanner-rotated-${Date.now()}-${Math.floor(Math.random() * 10000)}.jpg`;
-                    await react_native_fs_1.default.writeFile(destinationPath, base64FromStore, 'base64');
-                    finalPath = destinationPath;
-                    base64Result = base64FromStore;
+                    const rotatedUri = await rotateImageWithFallback(sourceUri, rotationNormalized);
+                    console.log('[FullDocScanner] Image rotated via react-native-image-rotate:', rotatedUri);
+                    // rotatedUri를 파일로 저장하고 base64 생성
+                    const destinationPath = `${react_native_fs_1.default.CachesDirectoryPath}/rotated_img_${Date.now()}.jpeg`;
+                    // rotatedUri는 이미 file://로 시작하므로 stripFileUri로 정리
+                    const cleanRotatedUri = stripFileUri(rotatedUri);
+                    // 파일 복사
+                    await react_native_fs_1.default.copyFile(cleanRotatedUri, destinationPath);
+                    console.log('[FullDocScanner] Copied rotated file to:', destinationPath);
+                    // Base64 생성
+                    const base64Data = await react_native_fs_1.default.readFile(destinationPath, 'base64');
+                    console.log('[FullDocScanner] Got result:', {
+                        path: destinationPath,
+                        hasBase64: true,
+                        base64Length: base64Data.length,
+                    });
+                    onResult({
+                        path: destinationPath,
+                        base64: base64Data,
+                    });
+                    setProcessing(false);
+                    return;
                 }
-                catch (readError) {
-                    console.warn('[FullDocScanner] Failed to persist rotated image from ImageStore:', readError);
+                catch (rotateError) {
+                    console.error('[FullDocScanner] react-native-image-rotate error:', rotateError);
+                    throw rotateError;
                 }
-                onResult({
-                    path: finalPath,
-                    base64: base64Result,
-                });
-                return;
             }
+            // 회전 불가능한 경우 경고 후 원본 반환
             console.warn('[FullDocScanner] Rotation requested but no supported rotation module is available. Returning original image.');
+            react_native_1.Alert.alert('알림', '이미지 회전 기능을 사용할 수 없습니다. 원본 이미지를 사용합니다.');
             onResult({
                 path: croppedImageData.path,
                 base64: croppedImageData.base64,
             });
+            setProcessing(false);
         }
         catch (error) {
             console.error('[FullDocScanner] Image rotation error on confirm:', error);
-            const errorMessage = error && typeof error === 'object' && 'message' in error ? error.message : '';
-            react_native_1.Alert.alert('회전 실패', '이미지 회전 중 오류가 발생했습니다: ' + errorMessage);
-        }
-        finally {
             setProcessing(false);
+            const errorMessage = error && typeof error === 'object' && 'message' in error ? error.message : String(error);
+            react_native_1.Alert.alert('회전 실패', `이미지 회전 중 오류가 발생했습니다.\n원본 이미지를 사용합니다.\n\n오류: ${errorMessage}`);
+            // 에러 발생 시 원본 이미지 반환
+            onResult({
+                path: croppedImageData.path,
+                base64: croppedImageData.base64,
+            });
         }
     }, [croppedImageData, rotationDegrees, onResult, rotateImageWithFallback]);
     const handleRetake = (0, react_1.useCallback)(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-rectangle-doc-scanner",
-  "version": "3.109.0",
+  "version": "3.110.0",
   "description": "Native-backed document scanner for React Native with customizable overlays.",
   "license": "MIT",
   "main": "dist/index.js",

package/src/FullDocScanner.tsx

@@ -8,7 +8,6 @@ import {
   Text,
   TouchableOpacity,
   View,
-  NativeModules,
 } from 'react-native';
 import { launchImageLibrary } from 'react-native-image-picker';
 import ImageCropPicker from 'react-native-image-crop-picker';
@@ -32,18 +31,8 @@ type ImageRotateModule = {
   ) => void;
 } | null;
 
-type ImageStoreModule = {
-  getBase64ForTag?: (
-    uri: string,
-    success: (base64: string) => void,
-    failure: (error: unknown) => void,
-  ) => void;
-  removeImageForTag?: (uri: string) => void;
-} | undefined;
-
 let ImageManipulator: ImageManipulatorModule | null = null;
 let ImageRotate: ImageRotateModule = null;
-const ImageStoreManager: ImageStoreModule = NativeModules.ImageStoreManager;
 
 try {
   ImageManipulator = require('expo-image-manipulator') as ImageManipulatorModule;
@@ -73,32 +62,6 @@ const isImageRotationSupported = () => isExpoImageManipulatorAvailable() || isIm
 const stripFileUri = (value: string) => value.replace(/^file:\/\//, '');
 const ensureFileUri = (value: string) => (value.startsWith('file://') ? value : `file://${value}`);
 
-const getBase64FromImageStore = async (uri: string): Promise<string> => {
-  const getBase64ForTag = ImageStoreManager?.getBase64ForTag?.bind(ImageStoreManager);
-
-  if (!getBase64ForTag) {
-    throw new Error('ImageStoreManager.getBase64ForTag unavailable');
-  }
-
-  return new Promise<string>((resolve, reject) => {
-    getBase64ForTag(
-      uri,
-      (base64: string) => resolve(base64),
-      (error: unknown) => {
-        const message =
-          typeof error === 'string'
-            ? error
-            : error && typeof error === 'object' && 'message' in error
-              ? String((error as any).message)
-              : 'Failed to read from ImageStore';
-        reject(new Error(message));
-      },
-    );
-  }).finally(() => {
-    ImageStoreManager?.removeImageForTag?.(uri);
-  });
-};
-
 const CROPPER_TIMEOUT_MS = 8000;
 const CROPPER_TIMEOUT_CODE = 'cropper_timeout';
 
@@ -581,8 +544,9 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
       return;
     }
 
-    // 회전이 없거나 모듈을 사용할 수 없으면 기존 데이터 그대로 전달
+    // 회전이 없으면 기존 데이터 그대로 전달
     if (rotationDegrees === 0) {
+      console.log('[FullDocScanner] No rotation, returning original image');
       onResult({
         path: croppedImageData.path,
         base64: croppedImageData.base64,
@@ -595,20 +559,26 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
 
       // 회전 각도 정규화 (0, 90, 180, 270)
       const rotationNormalized = ((rotationDegrees % 360) + 360) % 360;
+      console.log('[FullDocScanner] Rotation degrees:', rotationDegrees, 'normalized:', rotationNormalized);
 
       if (rotationNormalized === 0) {
+        console.log('[FullDocScanner] Normalized to 0, returning original image');
         onResult({
           path: croppedImageData.path,
           base64: croppedImageData.base64,
         });
+        setProcessing(false);
         return;
       }
 
+      // expo-image-manipulator 시도
       if (isExpoImageManipulatorAvailable() && ImageManipulator?.manipulateAsync) {
         try {
-          // expo-image-manipulator로 이미지 회전
+          console.log('[FullDocScanner] Using expo-image-manipulator for rotation');
+          const inputUri = ensureFileUri(croppedImageData.path);
+
           const result = await ImageManipulator.manipulateAsync(
-            croppedImageData.path,
+            inputUri,
             [{ rotate: rotationNormalized }],
             {
               compress: 0.9,
@@ -617,10 +587,16 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
             },
           );
 
-          onResult({
+          console.log('[FullDocScanner] Rotation complete via expo-image-manipulator:', {
             path: result.uri,
+            hasBase64: !!result.base64,
+          });
+
+          onResult({
+            path: stripFileUri(result.uri),
             base64: result.base64,
           });
+          setProcessing(false);
           return;
         } catch (manipulatorError) {
           const code =
@@ -628,10 +604,12 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
               ? String((manipulatorError as any).code)
               : undefined;
 
+          console.error('[FullDocScanner] expo-image-manipulator error:', manipulatorError);
+
           if (code === 'ERR_UNAVAILABLE') {
             expoManipulatorUnavailable = true;
             console.warn(
-              '[FullDocScanner] expo-image-manipulator unavailable at runtime. Falling back to react-native-image-rotate if possible.',
+              '[FullDocScanner] expo-image-manipulator unavailable at runtime. Trying react-native-image-rotate.',
             );
           } else {
             throw manipulatorError;
@@ -639,46 +617,68 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
         }
       }
 
+      // react-native-image-rotate 시도 (ImageStore 사용 안 함)
       if (isImageRotateAvailable && ImageRotate?.rotateImage) {
+        console.log('[FullDocScanner] Using react-native-image-rotate for rotation');
         const sourceUri = ensureFileUri(croppedImageData.path);
-        const rotatedUri = await rotateImageWithFallback(sourceUri, rotationNormalized);
-
-        let finalPath = croppedImageData.path;
-        let base64Result: string | undefined = croppedImageData.base64;
 
         try {
-          const base64FromStore = await getBase64FromImageStore(rotatedUri);
-          const destinationPath = `${RNFS.CachesDirectoryPath}/full-doc-scanner-rotated-${Date.now()}-${Math.floor(Math.random() * 10000)}.jpg`;
-
-          await RNFS.writeFile(destinationPath, base64FromStore, 'base64');
-          finalPath = destinationPath;
-          base64Result = base64FromStore;
-        } catch (readError) {
-          console.warn('[FullDocScanner] Failed to persist rotated image from ImageStore:', readError);
-        }
+          const rotatedUri = await rotateImageWithFallback(sourceUri, rotationNormalized);
+          console.log('[FullDocScanner] Image rotated via react-native-image-rotate:', rotatedUri);
 
-        onResult({
-          path: finalPath,
-          base64: base64Result,
-        });
-        return;
+          // rotatedUri를 파일로 저장하고 base64 생성
+          const destinationPath = `${RNFS.CachesDirectoryPath}/rotated_img_${Date.now()}.jpeg`;
+
+          // rotatedUri는 이미 file://로 시작하므로 stripFileUri로 정리
+          const cleanRotatedUri = stripFileUri(rotatedUri);
+
+          // 파일 복사
+          await RNFS.copyFile(cleanRotatedUri, destinationPath);
+          console.log('[FullDocScanner] Copied rotated file to:', destinationPath);
+
+          // Base64 생성
+          const base64Data = await RNFS.readFile(destinationPath, 'base64');
+          console.log('[FullDocScanner] Got result:', {
+            path: destinationPath,
+            hasBase64: true,
+            base64Length: base64Data.length,
+          });
+
+          onResult({
+            path: destinationPath,
+            base64: base64Data,
+          });
+          setProcessing(false);
+          return;
+        } catch (rotateError) {
+          console.error('[FullDocScanner] react-native-image-rotate error:', rotateError);
+          throw rotateError;
+        }
       }
 
+      // 회전 불가능한 경우 경고 후 원본 반환
       console.warn(
         '[FullDocScanner] Rotation requested but no supported rotation module is available. Returning original image.',
       );
+      Alert.alert('알림', '이미지 회전 기능을 사용할 수 없습니다. 원본 이미지를 사용합니다.');
       onResult({
         path: croppedImageData.path,
         base64: croppedImageData.base64,
       });
+      setProcessing(false);
     } catch (error) {
       console.error('[FullDocScanner] Image rotation error on confirm:', error);
+      setProcessing(false);
 
       const errorMessage =
-        error && typeof error === 'object' && 'message' in error ? (error as Error).message : '';
-      Alert.alert('회전 실패', '이미지 회전 중 오류가 발생했습니다: ' + errorMessage);
-    } finally {
-      setProcessing(false);
+        error && typeof error === 'object' && 'message' in error ? (error as Error).message : String(error);
+      Alert.alert('회전 실패', `이미지 회전 중 오류가 발생했습니다.\n원본 이미지를 사용합니다.\n\n오류: ${errorMessage}`);
+
+      // 에러 발생 시 원본 이미지 반환
+      onResult({
+        path: croppedImageData.path,
+        base64: croppedImageData.base64,
+      });
     }
   }, [croppedImageData, rotationDegrees, onResult, rotateImageWithFallback]);