react-native-compressor 1.12.0 → 1.14.0

package/android/build.gradle

@@ -115,7 +115,7 @@ dependencies {
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
   implementation 'org.mp4parser:isoparser:1.9.56'
-  implementation 'com.github.banketree:AndroidLame-kotlin:v0.0.1'
+  implementation 'com.github.kaushik-naik:TAndroidLame:277c2ab4b0'
   implementation 'javazoom:jlayer:1.0.1'
 }
 

package/ios/Audio/AudioMain.swift

@@ -7,10 +7,6 @@
 
 
 import AVFoundation
-
-
-
-let AlAsset_Library_Scheme = "assets-library"
 class AudioMain{
     static func compress_audio(_ fileUrl: String, optionMap: NSDictionary, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         do {

package/ios/Image/ImageCompressor.swift

@@ -366,18 +366,10 @@ class ImageCompressor {
             var size = CGSize.zero
             var scale: CGFloat = 1
             var resizeMode = RCTResizeMode.contain
-            var assetID = ""
-            var results: PHFetchResult<PHAsset>?
+            let assetID = imagePath.replacingOccurrences(of: "ph://", with: "")
+            let results = PHAsset.fetchAssets(withLocalIdentifiers: [assetID], options: nil)
             
-            if imageURL?.scheme?.caseInsensitiveCompare("assets-library") == .orderedSame {
-                assetID = imageURL?.absoluteString ?? ""
-                results = PHAsset.fetchAssets(withALAssetURLs: [imageURL!], options: nil)
-            } else {
-                assetID = imagePath.replacingOccurrences(of: "ph://", with: "")
-                results = PHAsset.fetchAssets(withLocalIdentifiers: [assetID], options: nil)
-            }
-            
-            guard let asset = results?.firstObject else {
+            guard let asset = results.firstObject else {
                 return
             }
             

package/ios/Image/ImageMain.swift

@@ -28,23 +28,47 @@ class ImageMain {
     static func getImageMetaData(_ filePath: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         let options = ImageCompressorOptions.fromDictionary([:])
         ImageCompressor.getAbsoluteImagePath(filePath, options: options) { ImagePath in
-            if ImagePath.hasPrefix("file://") {
-                let absoluteImagePath = URL(string: ImagePath)!.path
-                Utils.getFileSize(absoluteImagePath) { fileSize in
-                    let _extension = (absoluteImagePath as NSString).pathExtension
-                    let imageData = NSData(contentsOfFile: absoluteImagePath)!
-                    let imageSource = CGImageSourceCreateWithData(imageData, nil)!
-                    let imageProperties = CGImageSourceCopyPropertiesAtIndex(imageSource, 0, nil)!
-                    let exif=imageProperties as NSDictionary
-                    let mutableExif = exif.mutableCopy() as! NSMutableDictionary
-                    if let fileSizeInt = Int(fileSize as! String) {
-                        mutableExif.setValue(fileSizeInt, forKey: "size")
-                        }
-                    mutableExif.setValue(_extension, forKey: "extension")
-                    resolve(mutableExif)
-                } reject: { code, message, error in
-                    reject(code, message, error)
+            guard ImagePath.hasPrefix("file://") else {
+                reject("INVALID_PATH", "Image path must start with file://", nil)
+                return
+            }
+            
+            guard let url = URL(string: ImagePath) else {
+                reject("INVALID_URL", "Failed to create URL from image path", nil)
+                return
+            }
+            
+            let absoluteImagePath = url.path
+            let fileURL = url as CFURL
+            
+            Utils.getFileSize(absoluteImagePath) { fileSize in
+                let _extension = (absoluteImagePath as NSString).pathExtension
+                
+                // Use CGImageSourceCreateWithURL to avoid loading entire file into memory (prevents OOM crashes for large images)
+                guard let imageSource = CGImageSourceCreateWithURL(fileURL, nil) else {
+                    reject("INVALID_IMAGE", "Failed to create image source from URL", nil)
+                    return
+                }
+                
+                guard let imageProperties = CGImageSourceCopyPropertiesAtIndex(imageSource, 0, nil) else {
+                    reject("NO_PROPERTIES", "Failed to get image properties", nil)
+                    return
+                }
+                
+                let exif = imageProperties as NSDictionary
+                guard let mutableExif = exif.mutableCopy() as? NSMutableDictionary else {
+                    reject("COPY_ERROR", "Failed to create mutable copy of image properties", nil)
+                    return
+                }
+                
+                if let fileSizeString = fileSize as? String, let fileSizeInt = Int(fileSizeString) {
+                    mutableExif.setValue(fileSizeInt, forKey: "size")
                 }
+                
+                mutableExif.setValue(_extension, forKey: "extension")
+                resolve(mutableExif)
+            } reject: { code, message, error in
+                reject(code, message, error)
             }
         }
     }

package/ios/Utils/Utils.swift

@@ -17,10 +17,7 @@ class Utils {
     }
     
     static func makeValidUri(filePath: String) -> String {
-        let fileWithUrl = URL(fileURLWithPath: filePath)
-        let absoluteUrl = fileWithUrl.deletingLastPathComponent()
-        let fileUrl = "file://\(absoluteUrl.path)/\(fileWithUrl.lastPathComponent)"
-        return fileUrl;
+        return (filePath.starts(with: "file://") ? URL(string: filePath)! : URL(fileURLWithPath: filePath)).absoluteURL.absoluteString
     }
     
     static func getFileSize(from urlString: String, completion: @escaping (NSNumber?, Error?) -> Void) {
@@ -73,6 +70,8 @@ class Utils {
                    let fileSize = attrs[.size] as? UInt64 {
                     let fileSizeString = String(fileSize)
                     resolve(fileSizeString)
+                } else {
+                    reject("FILE_SIZE_ERROR", "Failed to get file size for path: \(filePath)", nil)
                 }
             }
         } catch {

package/ios/Video/VideoMain.swift

@@ -1,5 +1,4 @@
 import Foundation
-import AssetsLibrary
 import AVFoundation
 import Photos
 import MobileCoreServices

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-compressor",
-  "version": "1.12.0",
+  "version": "1.14.0",
   "description": "Compress Image, Video, and Audio same like Whatsapp & Auto/Manual Compression | Background Upload | Download File | Create Video Thumbnail",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",