react-native-fs-turbo 0.3.0 → 0.3.2

package/RNFSTurbo.podspec

@@ -11,14 +11,14 @@ Pod::Spec.new do |s|
   s.license         = package["license"]
   s.platforms       = { :ios => "12.4" }
   s.author          = package["author"]
-  s.source          = { :git => package["repository"], :tag => "#{s.version}" }
+  s.source          = { :git => "https://github.com/cmpayc/react-native-fs-turbo.git", :tag => "#{s.version}" }
   s.source_files = [
     "ios/**/*.{h,m,mm}",
     "cpp/**/*.{hpp,cpp,c,h}",
   ]
   s.resource_bundles = { 'RNFS_PrivacyInfo' => 'ios/PrivacyInfo.xcprivacy' }
   s.compiler_flags = '-x objective-c++'
-  s.frameworks = 'Photos'
+  s.frameworks = 'Photos', 'AVFoundation'
   s.pod_target_xcconfig = {
     "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
   }

package/android/src/main/cpp/RNFSTurboPlatformHelper.cpp

@@ -13,58 +13,92 @@ void JavaHashMapToStlStringStringMap(JNIEnv *env, jobject hashMap, std::map<std:
   // Get the Map's entry Set.
   jclass mapClass = env->FindClass("java/util/Map");
   if (mapClass == nullptr) {
-      return;
+    env->DeleteLocalRef(hashMap);
+    return;
   }
   jmethodID entrySet =
-          env->GetMethodID(mapClass, "entrySet", "()Ljava/util/Set;");
+    env->GetMethodID(mapClass, "entrySet", "()Ljava/util/Set;");
   if (entrySet == nullptr) {
+    env->DeleteLocalRef(hashMap);
+    env->DeleteLocalRef(mapClass);
     return;
   }
   jobject set = env->CallObjectMethod(hashMap, entrySet);
   if (set == nullptr) {
+    env->DeleteLocalRef(hashMap);
+    env->DeleteLocalRef(mapClass);
     return;
   }
   // Obtain an iterator over the Set
   jclass setClass = env->FindClass("java/util/Set");
   if (setClass == nullptr) {
+    env->DeleteLocalRef(hashMap);
+    env->DeleteLocalRef(mapClass);
+    env->DeleteLocalRef(set);
     return;
   }
   jmethodID iterator =
-          env->GetMethodID(setClass, "iterator", "()Ljava/util/Iterator;");
+    env->GetMethodID(setClass, "iterator", "()Ljava/util/Iterator;");
   if (iterator == nullptr) {
+    env->DeleteLocalRef(hashMap);
+    env->DeleteLocalRef(mapClass);
+    env->DeleteLocalRef(set);
+    env->DeleteLocalRef(setClass);
     return;
   }
   jobject iter = env->CallObjectMethod(set, iterator);
   if (iter == nullptr) {
+    env->DeleteLocalRef(hashMap);
+    env->DeleteLocalRef(mapClass);
+    env->DeleteLocalRef(set);
+    env->DeleteLocalRef(setClass);
     return;
   }
   // Get the Iterator method IDs
   jclass iteratorClass = env->FindClass("java/util/Iterator");
   if (iteratorClass == nullptr) {
+    env->DeleteLocalRef(hashMap);
+    env->DeleteLocalRef(mapClass);
+    env->DeleteLocalRef(set);
+    env->DeleteLocalRef(setClass);
+    env->DeleteLocalRef(iter);
     return;
   }
   jmethodID hasNext = env->GetMethodID(iteratorClass, "hasNext", "()Z");
-  if (hasNext == nullptr) {
-    return;
-  }
   jmethodID next =
-          env->GetMethodID(iteratorClass, "next", "()Ljava/lang/Object;");
-  if (next == nullptr) {
+    env->GetMethodID(iteratorClass, "next", "()Ljava/lang/Object;");
+  if (hasNext == nullptr || next == nullptr) {
+    env->DeleteLocalRef(hashMap);
+    env->DeleteLocalRef(mapClass);
+    env->DeleteLocalRef(set);
+    env->DeleteLocalRef(setClass);
+    env->DeleteLocalRef(iter);
+    env->DeleteLocalRef(iteratorClass);
     return;
   }
   // Get the Entry class method IDs
   jclass entryClass = env->FindClass("java/util/Map$Entry");
   if (entryClass == nullptr) {
+    env->DeleteLocalRef(hashMap);
+    env->DeleteLocalRef(mapClass);
+    env->DeleteLocalRef(set);
+    env->DeleteLocalRef(setClass);
+    env->DeleteLocalRef(iter);
+    env->DeleteLocalRef(iteratorClass);
     return;
   }
   jmethodID getKey =
-          env->GetMethodID(entryClass, "getKey", "()Ljava/lang/Object;");
-  if (getKey == nullptr) {
-    return;
-  }
+    env->GetMethodID(entryClass, "getKey", "()Ljava/lang/Object;");
   jmethodID getValue =
-          env->GetMethodID(entryClass, "getValue", "()Ljava/lang/Object;");
-  if (getValue == nullptr) {
+    env->GetMethodID(entryClass, "getValue", "()Ljava/lang/Object;");
+  if (getKey == nullptr || getValue == nullptr) {
+    env->DeleteLocalRef(hashMap);
+    env->DeleteLocalRef(mapClass);
+    env->DeleteLocalRef(set);
+    env->DeleteLocalRef(setClass);
+    env->DeleteLocalRef(iter);
+    env->DeleteLocalRef(iteratorClass);
+    env->DeleteLocalRef(entryClass);
     return;
   }
   // Iterate over the entry Set
@@ -90,6 +124,13 @@ void JavaHashMapToStlStringStringMap(JNIEnv *env, jobject hashMap, std::map<std:
     env->ReleaseStringUTFChars(value, valueStr);
     env->DeleteLocalRef(value);
   }
+  env->DeleteLocalRef(hashMap);
+  env->DeleteLocalRef(mapClass);
+  env->DeleteLocalRef(set);
+  env->DeleteLocalRef(setClass);
+  env->DeleteLocalRef(iter);
+  env->DeleteLocalRef(iteratorClass);
+  env->DeleteLocalRef(entryClass);
 }
 
 extern "C"
@@ -102,14 +143,6 @@ JNIEXPORT void JNICALL Java_com_cmpayc_rnfsturbo_RNFSTurboPlatformHelper_downloa
 ) {
   std::map<int, DownloadCallbacks>::iterator it = RNFSTurboPlatformHelper::downloadCallbacks.find(jobId);
   if (it != RNFSTurboPlatformHelper::downloadCallbacks.end()) {
-    const auto now = std::chrono::steady_clock::now();
-    const auto elapsedTime = std::chrono::duration_cast<std::chrono::milliseconds>(
-      now - RNFSTurboPlatformHelper::downloadCallbacks[jobId].lastProgressCall
-    ).count();
-    RNFSTurboPlatformHelper::downloadCallbacks[jobId].lastProgressCall = now - std::chrono::seconds(1);
-    if (elapsedTime < 50) {
-        std::this_thread::sleep_for(std::chrono::milliseconds(100));
-    }
     RNFSTurboPlatformHelper::downloadCallbacks[jobId].completeCallback(
       jobId,
       statusCode,
@@ -168,20 +201,13 @@ JNIEXPORT void JNICALL Java_com_cmpayc_rnfsturbo_RNFSTurboPlatformHelper_downloa
   double contentLength,
   double bytesWritten
 ) {
-  std::map<int, DownloadCallbacks>::iterator callback = RNFSTurboPlatformHelper::downloadCallbacks.find(jobId);
-  if (callback != RNFSTurboPlatformHelper::downloadCallbacks.end()) {
-    const auto now = std::chrono::steady_clock::now();
-    const auto elapsedTime = std::chrono::duration_cast<std::chrono::milliseconds>(
-      now - RNFSTurboPlatformHelper::downloadCallbacks[jobId].lastProgressCall
-    ).count();
-    if (elapsedTime > 50) {
-      RNFSTurboPlatformHelper::downloadCallbacks[jobId].progressCallback(
-        jobId,
-        static_cast<float>(contentLength),
-        static_cast<float>(bytesWritten)
-      );
-      RNFSTurboPlatformHelper::downloadCallbacks[jobId].lastProgressCall = now;
-    }
+  std::map<int, DownloadCallbacks>::iterator it = RNFSTurboPlatformHelper::downloadCallbacks.find(jobId);
+  if (it != RNFSTurboPlatformHelper::downloadCallbacks.end()) {
+    RNFSTurboPlatformHelper::downloadCallbacks[jobId].progressCallback(
+      jobId,
+      static_cast<float>(contentLength),
+      static_cast<float>(bytesWritten)
+    );
   }
 }
 
@@ -196,12 +222,6 @@ JNIEXPORT void JNICALL Java_com_cmpayc_rnfsturbo_RNFSTurboPlatformHelper_uploadC
 ) {
   std::map<int, UploadCallbacks>::iterator it = RNFSTurboPlatformHelper::uploadCallbacks.find(jobId);
   if (it != RNFSTurboPlatformHelper::uploadCallbacks.end()) {
-    const auto now = std::chrono::steady_clock::now();
-    const auto elapsedTime = std::chrono::duration_cast<std::chrono::milliseconds>(now - RNFSTurboPlatformHelper::uploadCallbacks[jobId].lastProgressCall).count();
-    RNFSTurboPlatformHelper::uploadCallbacks[jobId].lastProgressCall = now - std::chrono::seconds(1);
-    if (elapsedTime < 50) {
-      std::this_thread::sleep_for(std::chrono::milliseconds(100));
-    }
     std::map<std::string, std::string> headers;
     JavaHashMapToStlStringStringMap(env, headersObj, headers);
     const char *body = env->GetStringUTFChars(bodyStr, nullptr);
@@ -233,20 +253,13 @@ JNIEXPORT void JNICALL Java_com_cmpayc_rnfsturbo_RNFSTurboPlatformHelper_uploadP
   double totalBytesExpectedToSend,
   double totalBytesSent
 ) {
-  std::map<int, UploadCallbacks>::iterator callback = RNFSTurboPlatformHelper::uploadCallbacks.find(jobId);
-  if (callback != RNFSTurboPlatformHelper::uploadCallbacks.end()) {
-    const auto now = std::chrono::steady_clock::now();
-    const auto elapsedTime = std::chrono::duration_cast<std::chrono::milliseconds>(
-      now - RNFSTurboPlatformHelper::uploadCallbacks[jobId].lastProgressCall
-    ).count();
-    if (elapsedTime > 50) {
-      RNFSTurboPlatformHelper::uploadCallbacks[jobId].progressCallback(
-        jobId,
-        static_cast<float>(totalBytesExpectedToSend),
-        static_cast<float>(totalBytesSent)
-      );
-      RNFSTurboPlatformHelper::uploadCallbacks[jobId].lastProgressCall = now;
-    }
+  std::map<int, UploadCallbacks>::iterator it = RNFSTurboPlatformHelper::uploadCallbacks.find(jobId);
+  if (it != RNFSTurboPlatformHelper::uploadCallbacks.end()) {
+    RNFSTurboPlatformHelper::uploadCallbacks[jobId].progressCallback(
+      jobId,
+      static_cast<float>(totalBytesExpectedToSend),
+      static_cast<float>(totalBytesSent)
+    );
   }
 }
 
@@ -312,7 +325,7 @@ std::vector<ReadDirItem> RNFSTurboPlatformHelper::readDirAssets(const char* dirP
     jniObj,
     mid,
     jniEnv->NewStringUTF(dirPath)
- );
+  );
   if (jniEnv->ExceptionCheck()) {
     jniEnv->ExceptionClear();
     throw "Dir not exists or access denied";
@@ -341,8 +354,8 @@ std::vector<ReadDirItem> RNFSTurboPlatformHelper::readDirAssets(const char* dirP
     jniEnv->ReleaseStringUTFChars(isDirectoryStr, isDirectoryChr);
     jniEnv->DeleteLocalRef(isDirectoryStr);
   }
-  jniEnv->DeleteLocalRef(filesObject);
   jniEnv->DeleteLocalRef(jniCls);
+  jniEnv->DeleteLocalRef(filesObject);
 
   return files;
 }
@@ -369,6 +382,9 @@ std::string RNFSTurboPlatformHelper::readFileAssetsOrRes(const char* filePath, b
   std::string fileData = (char*) fileJBytes;
   jniEnv->ReleaseByteArrayElements(fileBytesArr, fileJBytes, 0);
 
+  jniEnv->DeleteLocalRef(jniCls);
+  jniEnv->DeleteLocalRef(fileBytesArr);
+
   return fileData;
 }
 
@@ -387,6 +403,7 @@ void RNFSTurboPlatformHelper::copyFileAssetsOrRes(const char *filePath, const ch
     jniEnv->NewStringUTF(destPath),
     isRes
   );
+  jniEnv->DeleteLocalRef(jniCls);
   if (jniEnv->ExceptionCheck()) {
     jniEnv->ExceptionClear();
     throw isRes ? "Failed to copy res" : "Failed to copy asset";
@@ -407,6 +424,7 @@ bool RNFSTurboPlatformHelper::existsAssetsOrRes(const char *filePath, bool isRes
     jniEnv->NewStringUTF(filePath),
     isRes
   );
+  jniEnv->DeleteLocalRef(jniCls);
   if (jniEnv->ExceptionCheck()) {
     jniEnv->ExceptionClear();
     throw isRes ? "Failed to open asset" : "Failed to open res";
@@ -469,7 +487,7 @@ void RNFSTurboPlatformHelper::downloadFile(
   }
 
   jniEnv->CallVoidMethod(
-    jniCls,
+    jniObj,
     mid,
     jobId,
     jniEnv->NewStringUTF(fromUrl),
@@ -482,9 +500,9 @@ void RNFSTurboPlatformHelper::downloadFile(
     hasBeginCallback,
     hasProgressCallback
   );
+  jniEnv->DeleteLocalRef(jniCls);
   jniEnv->DeleteLocalRef(mapClass);
   jniEnv->DeleteLocalRef(headersMap);
-  jniEnv->DeleteLocalRef(headersMap);
 }
 
 void RNFSTurboPlatformHelper::stopDownload(int jobId) {
@@ -496,7 +514,7 @@ void RNFSTurboPlatformHelper::stopDownload(int jobId) {
   );
 
   jniEnv->CallVoidMethod(
-    jniCls,
+    jniObj,
     mid,
     jobId
   );
@@ -588,7 +606,7 @@ void RNFSTurboPlatformHelper::uploadFiles(
   }
 
   jniEnv->CallVoidMethod(
-    jniCls,
+    jniObj,
     mid,
     jobId,
     jniEnv->NewStringUTF(toUrl),
@@ -618,7 +636,7 @@ void RNFSTurboPlatformHelper::stopUpload(int jobId) {
   );
 
   jniEnv->CallVoidMethod(
-    jniCls,
+    jniObj,
     mid,
     jobId
   );
@@ -627,8 +645,8 @@ void RNFSTurboPlatformHelper::stopUpload(int jobId) {
 
 FSInfo RNFSTurboPlatformHelper::getFSInfo() {
   jclass jniCls = jniEnv->GetObjectClass(jniObj);
-  jmethodID mid = jniEnv->GetStaticMethodID(jniCls, "getFSInfo", "()[J");
-  jobject infoArr = jniEnv->CallObjectMethod(jniCls, mid);
+  jmethodID mid = jniEnv->GetMethodID(jniCls, "getFSInfo", "()[J");
+  jobject infoArr = jniEnv->CallObjectMethod(jniObj, mid);
   jlongArray *infoLongArr = reinterpret_cast<jlongArray*>(&infoArr);
   jlong* infoData = jniEnv->GetLongArrayElements(*infoLongArr, NULL);
 
@@ -640,8 +658,8 @@ FSInfo RNFSTurboPlatformHelper::getFSInfo() {
   };
 
   jniEnv->ReleaseLongArrayElements(*infoLongArr, infoData, 0);
-  jniEnv->DeleteLocalRef(infoArr);
   jniEnv->DeleteLocalRef(jniCls);
+  jniEnv->DeleteLocalRef(infoArr);
 
   return fsInfo;
 }
@@ -661,6 +679,7 @@ void RNFSTurboPlatformHelper::scanFile(int jobId, const char *path, RNFSTurboSca
     jobId,
     jniEnv->NewStringUTF(path)
   );
+  jniEnv->DeleteLocalRef(jniCls);
   if (jniEnv->ExceptionCheck()) {
     jniEnv->ExceptionClear();
     std::map<int, RNFSTurboScanCallback>::iterator it = RNFSTurboPlatformHelper::scanCallbacks.find(jobId);
@@ -669,7 +688,6 @@ void RNFSTurboPlatformHelper::scanFile(int jobId, const char *path, RNFSTurboSca
     }
     throw "Scan error";
   }
-  jniEnv->DeleteLocalRef(jniCls);
 }
 
 std::vector<std::string> RNFSTurboPlatformHelper::getAllExternalFilesDirs() {

package/android/src/main/java/com/cmpayc/rnfsturbo/RNFSTurboPlatformHelper.java

@@ -223,12 +223,15 @@ public class RNFSTurboPlatformHelper {
 
       params.onTaskCompleted = new RNFSTurboDownloadParams.OnTaskCompleted() {
         public void onTaskCompleted(RNFSTurboDownloadResult res) {
-          if (res.exception == null) {
-            downloadCompleteCallback(jobId, res.statusCode, (double)res.bytesWritten);
-          } else {
-            downloadErrorCallback(jobId, res.exception.toString());
+          RNFSTurboDownloader downloader = downloaders.get(jobId);
+          if (downloader != null) {
+            if (res.exception == null) {
+              downloadCompleteCallback(jobId, res.statusCode, (double)res.bytesWritten);
+            } else {
+              downloadErrorCallback(jobId, res.exception.toString());
+            }
+            downloaders.remove(jobId);
           }
-          downloaders.remove(jobId);
         }
       };
 
@@ -236,7 +239,10 @@ public class RNFSTurboPlatformHelper {
         params.onDownloadBegin = new RNFSTurboDownloadParams.OnDownloadBegin() {
           @Override
           public void onDownloadBegin(int statusCode, long contentLength, Map<String, String> headers) {
-            downloadBeginCallback(jobId, statusCode, (double)contentLength, new HashMap<String, String>(headers));
+            RNFSTurboDownloader downloader = downloaders.get(jobId);
+            if (downloader != null) {
+              downloadBeginCallback(jobId, statusCode, (double)contentLength, new HashMap<String, String>(headers));
+            }
           }
         };
       }
@@ -244,7 +250,10 @@ public class RNFSTurboPlatformHelper {
       if (hasProgressCallback) {
         params.onDownloadProgress = new RNFSTurboDownloadParams.OnDownloadProgress() {
           public void onDownloadProgress(long contentLength, long bytesWritten) {
-            downloadProgressCallback(jobId, (double)contentLength, (double)bytesWritten);
+            RNFSTurboDownloader downloader = downloaders.get(jobId);
+            if (downloader != null) {
+              downloadProgressCallback(jobId, (double)contentLength, (double)bytesWritten);
+            }
           }
         };
       }

package/cpp/NativeRNFSTurboModule.cpp

@@ -11,12 +11,13 @@
 namespace facebook::react {
 
 NativeRNFSTurboModule::NativeRNFSTurboModule(std::shared_ptr<CallInvoker> jsInvoker)
-    : NativeRNFSTurboModuleCxxSpec(jsInvoker) {}
+    : NativeRNFSTurboModuleCxxSpec(std::move(jsInvoker)) {}
 
 NativeRNFSTurboModule::~NativeRNFSTurboModule() {}
 
 jsi::Object NativeRNFSTurboModule::createRNFSTurbo(jsi::Runtime& runtime) {
   auto instance = std::make_shared<RNFSTurboHostObject>();
+  instance->jsInvoker = jsInvoker_;
   return jsi::Object::createFromHostObject(runtime, instance);
 }
 

package/cpp/RNFSTurboHostObject.cpp

@@ -36,7 +36,7 @@ jsi::Value RNFSTurboHostObject::get(jsi::Runtime& runtime, const jsi::PropNameID
   std::string propName = propNameId.utf8(runtime);
 
   RNFSTurboLogger::log("RNFSTurbo", "call func %s...", propName.c_str());
-
+  
   if (propName == "stat") {
     return jsi::Function::createFromHostFunction(
       runtime, jsi::PropNameID::forAscii(runtime, propName),
@@ -1139,47 +1139,57 @@ jsi::Value RNFSTurboHostObject::get(jsi::Runtime& runtime, const jsi::PropNameID
         RNFSTurboPlatformHelper::jobId += 1;
         int jobId = RNFSTurboPlatformHelper::jobId;
         
-        RNFSTurboCompleteDownloadCallback completeCallback = [&runtime, completeFunc](int jobId, int statusCode, float bytesWritten) -> void {
-          jsi::Object result = jsi::Object(runtime);
-          result.setProperty(runtime, "jobId", jsi::Value(jobId));
-          result.setProperty(runtime, "statusCode", jsi::Value(statusCode));
-          result.setProperty(runtime, "bytesWritten", jsi::Value(bytesWritten));
-          completeFunc->call(runtime, std::move(result));
+        RNFSTurboCompleteDownloadCallback completeCallback = [&runtime, completeFunc, this](int jobId, int statusCode, float bytesWritten) -> void {
+          jsInvoker->invokeAsync([&runtime, completeFunc, jobId, statusCode, bytesWritten]() {
+            jsi::Object result = jsi::Object(runtime);
+            result.setProperty(runtime, "jobId", jsi::Value(jobId));
+            result.setProperty(runtime, "statusCode", jsi::Value(statusCode));
+            result.setProperty(runtime, "bytesWritten", jsi::Value(bytesWritten));
+            completeFunc->call(runtime, std::move(result));
+          });
         };
         
-        RNFSTurboErrorCallback errorCallback = [&runtime, errorFunc](int jobId, const char* errorMessage) -> void {
-          errorFunc->call(runtime, jsi::String::createFromUtf8(runtime, RNFSTurboLogger::sprintf("%s: %s", "downloadFile", errorMessage)));
+        RNFSTurboErrorCallback errorCallback = [&runtime, errorFunc, this](int jobId, const char* errorMessage) -> void {
+          jsInvoker->invokeAsync([&runtime, errorFunc, jobId, errorMessage]() {
+            errorFunc->call(runtime, jsi::String::createFromUtf8(runtime, RNFSTurboLogger::sprintf("%s: %s", "downloadFile", errorMessage)));
+          });
         };
         
         std::optional<RNFSTurboBeginDownloadCallback> beginCallback = std::nullopt;
         if (beginCallbackFunc) {
-          beginCallback = [&runtime, beginCallbackFunc](int jobId, int statusCode, float contentLength, std::map<std::string, std::string> headers) -> void {
-            jsi::Object result = jsi::Object(runtime);
-            result.setProperty(runtime, "jobId", jsi::Value(jobId));
-            result.setProperty(runtime, "statusCode", jsi::Value(statusCode));
-            result.setProperty(runtime, "contentLength", jsi::Value(contentLength));
-            jsi::Object jsHeaders = jsi::Object(runtime);
-            for (auto const& [key, val] : headers) {
-              jsHeaders.setProperty(runtime, key.c_str(), jsi::String::createFromUtf8(runtime, val));
-            }
-            result.setProperty(runtime, "headers", jsHeaders);
-            beginCallbackFunc->call(runtime, std::move(result));
+          beginCallback = [&runtime, beginCallbackFunc, this](int jobId, int statusCode, float contentLength, std::map<std::string, std::string> headers) -> void {
+            jsInvoker->invokeAsync([&runtime, beginCallbackFunc, jobId, statusCode, contentLength, headers]() {
+              jsi::Object result = jsi::Object(runtime);
+              result.setProperty(runtime, "jobId", jsi::Value(jobId));
+              result.setProperty(runtime, "statusCode", jsi::Value(statusCode));
+              result.setProperty(runtime, "contentLength", jsi::Value(contentLength));
+              jsi::Object jsHeaders = jsi::Object(runtime);
+              for (auto const& [key, val] : headers) {
+                jsHeaders.setProperty(runtime, key.c_str(), jsi::String::createFromUtf8(runtime, val));
+              }
+              result.setProperty(runtime, "headers", jsHeaders);
+              beginCallbackFunc->call(runtime, std::move(result));
+            });
           };
         }
         std::optional<RNFSTurboProgressDownloadCallback> progressCallback = std::nullopt;
         if (progressCallbackFunc) {
-          progressCallback = [&runtime, progressCallbackFunc](int jobId, float contentLength, float bytesWritten) -> void {
-            jsi::Object result = jsi::Object(runtime);
-            result.setProperty(runtime, "jobId", jsi::Value(jobId));
-            result.setProperty(runtime, "contentLength", jsi::Value(contentLength));
-            result.setProperty(runtime, "bytesWritten", jsi::Value(bytesWritten));
-            progressCallbackFunc->call(runtime, std::move(result));
+          progressCallback = [&runtime, progressCallbackFunc, this](int jobId, float contentLength, float bytesWritten) -> void {
+            jsInvoker->invokeAsync([&runtime, progressCallbackFunc, jobId, contentLength, bytesWritten]() {
+              jsi::Object result = jsi::Object(runtime);
+              result.setProperty(runtime, "jobId", jsi::Value(jobId));
+              result.setProperty(runtime, "contentLength", jsi::Value(contentLength));
+              result.setProperty(runtime, "bytesWritten", jsi::Value(bytesWritten));
+              progressCallbackFunc->call(runtime, std::move(result));
+            });
           };
         }
         std::optional<RNFSTurboResumableDownloadCallback> resumableCallback = std::nullopt;
         if (resumableCallbackFunc) {
-          resumableCallback = [&runtime, resumableCallbackFunc](int jobId) -> void {
-            resumableCallbackFunc->call(runtime, jsi::Value(jobId));
+          resumableCallback = [&runtime, resumableCallbackFunc, this](int jobId) -> void {
+            jsInvoker->invokeAsync([&runtime, resumableCallbackFunc, jobId]() {
+              resumableCallbackFunc->call(runtime, jsi::Value(jobId));
+            });
           };
         }
         
@@ -1428,26 +1438,32 @@ jsi::Value RNFSTurboHostObject::get(jsi::Runtime& runtime, const jsi::PropNameID
           completeFunc->call(runtime, std::move(result));
         };
         
-        RNFSTurboErrorCallback errorCallback = [&runtime, errorFunc](int jobId, const char* errorMessage) -> void {
-          errorFunc->call(runtime, jsi::String::createFromUtf8(runtime, RNFSTurboLogger::sprintf("%s: %s", "uploadFiles", errorMessage)));
+        RNFSTurboErrorCallback errorCallback = [&runtime, errorFunc, this](int jobId, const char* errorMessage) -> void {
+          jsInvoker->invokeAsync([&runtime, errorFunc, errorMessage]() {
+            errorFunc->call(runtime, jsi::String::createFromUtf8(runtime, RNFSTurboLogger::sprintf("%s: %s", "uploadFiles", errorMessage)));
+          });
         };
         
         std::optional<RNFSTurboBeginUploadCallback> beginCallback = std::nullopt;
         if (beginCallbackFunc) {
-          beginCallback = [&runtime, beginCallbackFunc](int jobId) -> void {
-            jsi::Object result = jsi::Object(runtime);
-            result.setProperty(runtime, "jobId", jsi::Value(jobId));
-            beginCallbackFunc->call(runtime, std::move(result));
+          beginCallback = [&runtime, beginCallbackFunc, this](int jobId) -> void {
+            jsInvoker->invokeAsync([&runtime, beginCallbackFunc, jobId]() {
+              jsi::Object result = jsi::Object(runtime);
+              result.setProperty(runtime, "jobId", jsi::Value(jobId));
+              beginCallbackFunc->call(runtime, std::move(result));
+            });
           };
         }
         std::optional<RNFSTurboProgressUploadCallback> progressCallback = std::nullopt;
         if (progressCallbackFunc) {
-          progressCallback = [&runtime, progressCallbackFunc](int jobId, float totalBytesExpectedToSend, float totalBytesSent) -> void {
-            jsi::Object result = jsi::Object(runtime);
-            result.setProperty(runtime, "jobId", jsi::Value(jobId));
-            result.setProperty(runtime, "totalBytesExpectedToSend", jsi::Value(totalBytesExpectedToSend));
-            result.setProperty(runtime, "totalBytesSent", jsi::Value(totalBytesSent));
-            progressCallbackFunc->call(runtime, std::move(result));
+          progressCallback = [&runtime, progressCallbackFunc, this](int jobId, float totalBytesExpectedToSend, float totalBytesSent) -> void {
+            jsInvoker->invokeAsync([&runtime, progressCallbackFunc, jobId, totalBytesExpectedToSend, totalBytesSent]() {
+              jsi::Object result = jsi::Object(runtime);
+              result.setProperty(runtime, "jobId", jsi::Value(jobId));
+              result.setProperty(runtime, "totalBytesExpectedToSend", jsi::Value(totalBytesExpectedToSend));
+              result.setProperty(runtime, "totalBytesSent", jsi::Value(totalBytesSent));
+              progressCallbackFunc->call(runtime, std::move(result));
+            });
           };
         }
         
@@ -1544,11 +1560,13 @@ jsi::Value RNFSTurboHostObject::get(jsi::Runtime& runtime, const jsi::PropNameID
         RNFSTurboPlatformHelper::jobId += 1;
         int jobId = RNFSTurboPlatformHelper::jobId;
 
-        RNFSTurboScanCallback scanCallback = [&runtime, scanFunc](int jobId, std::string path) -> void {
-          jsi::Object result = jsi::Object(runtime);
-          result.setProperty(runtime, "jobId", jsi::Value(jobId));
-          result.setProperty(runtime, "path", jsi::String::createFromUtf8(runtime, path));
-          scanFunc->call(runtime, std::move(result));
+        RNFSTurboScanCallback scanCallback = [&runtime, scanFunc, this](int jobId, std::string path) -> void {
+          jsInvoker->invokeAsync([&runtime, scanFunc, jobId, path]() {
+            jsi::Object result = jsi::Object(runtime);
+            result.setProperty(runtime, "jobId", jsi::Value(jobId));
+            result.setProperty(runtime, "path", jsi::String::createFromUtf8(runtime, path));
+            scanFunc->call(runtime, std::move(result));
+          });
         };
 
         try {
@@ -1556,10 +1574,10 @@ jsi::Value RNFSTurboHostObject::get(jsi::Runtime& runtime, const jsi::PropNameID
         } catch (const char* error_message) {
           throw jsi::JSError(runtime, RNFSTurboLogger::sprintf("%s: %s", "scanFile", error_message));
         }
+        return jsi::Value(jobId);
 #else
         throw jsi::JSError(runtime, RNFSTurboLogger::sprintf("%s: %s", "scanFile", "Command only for Android"));
 #endif
-        return jsi::Value::undefined();
       }
     );
   }

package/cpp/RNFSTurboHostObject.h

@@ -42,6 +42,7 @@ public:
 public:
   jsi::Value get(jsi::Runtime&, const jsi::PropNameID& name) override;
   std::vector<jsi::PropNameID> getPropertyNames(jsi::Runtime& rt) override;
+  std::shared_ptr<facebook::react::CallInvoker> jsInvoker;
 
 private:
   RNFSTurboPlatformHelper* platformHelper;

package/cpp/RNFSTurboPlatformHelper.h

@@ -58,7 +58,6 @@ struct DownloadCallbacks {
   RNFSTurboBeginDownloadCallback beginCallback;
   RNFSTurboProgressDownloadCallback progressCallback;
   RNFSTurboResumableDownloadCallback resumableCallback;
-  std::chrono::time_point<std::chrono::steady_clock> lastProgressCall{ std::chrono::steady_clock::now() };
 };
 
 struct UploadCallbacks {
@@ -66,7 +65,6 @@ struct UploadCallbacks {
   RNFSTurboErrorCallback errorCallback;
   RNFSTurboBeginUploadCallback beginCallback;
   RNFSTurboProgressUploadCallback progressCallback;
-  std::chrono::time_point<std::chrono::steady_clock> lastProgressCall{ std::chrono::steady_clock::now() };
 };
 
 class RNFSTurboPlatformHelper {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-fs-turbo",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "React-Native library for working with Android/iOS file system, written using JSI and C++ TurboModules",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",