react-native-fs-turbo 0.2.0 → 0.3.1

package/README.md

@@ -278,61 +278,175 @@ type ReadDirItem = {
 
 Node.js style version of `readDir` that returns only the names. Note the lowercase `d`.
 
-### `readFile(filepath: string, encoding?: 'utf8' | 'ascii' | 'base64' | 'uint8' | 'float32'): string | number[]`
+### `readFile(filepath: string, options?: ReadOptions): string | number[]`
 
-Reads the file at `path` and return contents. `encoding` can be one of `utf8` (default), `ascii`, `base64`, `uint8`. Use `base64` or `uint8` or `float32` for reading binary files.
+Reads the file at `path` and return contents. `options` can be string of encrypted types or object, default is `utf8`. Use `base64` or `uint8` or `float32` encoding for reading binary files.
+
+```ts
+type ReadOptions =
+  | 'utf8' | 'ascii' | 'base64' | 'uint8' | 'float32'
+  | { encoding: 'utf8' | 'ascii' | 'base64' | 'uint8' | 'float32' };
+```
 
 Note: you will take quite a performance hit if you are reading big files
 
-### `read(filepath: string, length: number, position: number, encoding?: 'utf8' | 'ascii' | 'base64' | 'uint8' | 'float32'): string | number[]`
+### `read(filepath: string, length: number, position: number, options?: ReadOptions): string | number[]`
 
-Reads `length` bytes from the given `position` of the file at `path` and returns contents. `encoding` can be one of `utf8` (default), `ascii`, `base64`, `uint8`, `float32`. Use `base64` or `uint8` or `float32` for reading binary files.
+Reads `length` bytes from the given `position` of the file at `path` and returns contents. `options` can be string of encrypted types or object, default is `utf8`. Use `base64` or `uint8` or `float32` encoding for reading binary files.
+
+```ts
+type ReadOptions =
+  | 'utf8' | 'ascii' | 'base64' | 'uint8' | 'float32'
+  | { encoding: 'utf8' | 'ascii' | 'base64' | 'uint8' | 'float32' };
+```
 
 Note: reading big files piece by piece using this method may be useful in terms of performance.
 Note: `float32` size is 4 bytes, so `position` and `length` should be specified in bytes (multiplied by 4)
 
-### (Android only) `readFileAssets(filepath: string, encoding?: "utf8" | 'ascii' | "base64") => string[]`
+### (Android only) `readFileAssets(filepath: string, options?: ReadOptions) => string[]`
 
-Reads the file at `path` in the Android app's assets folder and return contents. `encoding` can be one of `utf8` (default), `ascii`, `base64`. Use `base64` or `uint8` for reading binary files.
+Reads the file at `path` in the Android app's assets folder and return contents. `options` can be string of encrypted types or object, default is `utf8`. Use `base64` encoding for reading binary files.
 
 `filepath` is the relative path to the file from the root of the `assets` folder.
 
-### (Android only) `readFileRes: (filepath: string, encoding?: "utf8" | 'ascii' | "base64") => string[]`
+```ts
+type ReadOptions =
+  | 'utf8' | 'ascii' | 'base64'
+  | { encoding: 'utf8' | 'ascii' | 'base64' };
+```
 
-Reads the file named `filename` in the Android app's `res` folder and return contents. Only the file name (not folder) needs to be specified. The file type will be detected from the extension and automatically located within `res/drawable` (for image files) or `res/raw` (for everything else). `encoding` can be one of `utf8` (default), `ascii`, `base64`. Use `base64` for reading binary files.
+### (Android only) `readFileRes: (filepath: string, options?: ReadOptions) => string[]`
 
-### `writeFile(filepath: string, contents: string | number[], encoding?: "utf8" | 'ascii' | "base64" | "uint8" | "float32"): void`
+Reads the file named `filename` in the Android app's `res` folder and return contents. Only the file name (not folder) needs to be specified. The file type will be detected from the extension and automatically located within `res/drawable` (for image files) or `res/raw` (for everything else). `options` can be string of encrypted types or object, default is `utf8`. Use `base64` encoding for reading binary files.
 
-Write the `contents` to `filepath`. `encoding` can be one of `utf8` (default), `ascii`, `base64`, `uint8`, `float32`. `options` optionally takes an object specifying the file's properties, like mode etc.
+```ts
+type ReadOptions =
+  | 'utf8' | 'ascii' | 'base64'
+  | { encoding: 'utf8' | 'ascii' };
+```
 
-### `appendFile(filepath: string, contents: string | number[], encoding?: "utf8" | 'ascii' | "base64" | "uint8" | "float32"): void`
+### `writeFile(filepath: string, contents: string | number[], options?: WriteOptions): void`
 
-Append the `contents` to `filepath`. `encoding` can be one of `utf8` (default), `ascii`, `base64`, `uint8`, `float32`.
+Write the `contents` to `filepath`. `options` can be string of encrypted types or object, default is `utf8`
+
+```ts
+type WriteOptions =
+  | 'utf8' | 'ascii' | 'base64' | 'uint8' | 'float32'
+  | {
+      encoding?: 'utf8' | 'ascii' | 'base64' | 'uint8' | 'float32',
+      NSFileProtectionKey?:
+        |"NSFileProtectionNone"
+        | "NSFileProtectionComplete"
+        | "NSFileProtectionCompleteUnlessOpen"
+        | "NSFileProtectionCompleteUntilFirstUserAuthentication"
+        | "NSFileProtectionCompleteWhenUserInactive" // iOS 17+ only
+    };
+```
+
+(IOS only): `options.NSFileProtectionKey` property can be provided to set this attribute on iOS platforms.
+
+### `appendFile(filepath: string, contents: string | number[], options?: WriteOptions): void`
+
+Append the `contents` to `filepath`. `encoding` can be string of encrypted types or object, default is `utf8`.
+
+```ts
+type WriteOptions =
+  | 'utf8' | 'ascii' | 'base64' | 'uint8' | 'float32'
+  | {
+      encoding?: 'utf8' | 'ascii' | 'base64' | 'uint8' | 'float32',
+      NSFileProtectionKey?:
+        |"NSFileProtectionNone"
+        | "NSFileProtectionComplete"
+        | "NSFileProtectionCompleteUnlessOpen"
+        | "NSFileProtectionCompleteUntilFirstUserAuthentication"
+        | "NSFileProtectionCompleteWhenUserInactive" // iOS 17+ only
+    };
+```
 
-### `write(filepath: string, contents: string | number[], position?: number, encoding?: "utf8" | "base64" | "uint8" | "float32"): void`
+(IOS only): `options.NSFileProtectionKey` property can be provided to set this attribute on iOS platforms.
 
-Write the `contents` to `filepath` at the given random access position. When `position` is `undefined` or `-1` the contents is appended to the end of the file. `encoding` can be one of `utf8` (default), `ascii`, `base64`, `uint8`, `float32`.
+### `write(filepath: string, contents: string | number[], position?: number, options?: WriteOptions): void`
+
+Write the `contents` to `filepath` at the given random access position. When `position` is `undefined` or `-1` the contents is appended to the end of the file. `encoding` can be string of encrypted types or object, default is `utf8`.
+
+```ts
+type WriteOptions =
+  | 'utf8' | 'ascii' | 'base64' | 'uint8' | 'float32'
+  | {
+      encoding?: 'utf8' | 'ascii' | 'base64' | 'uint8' | 'float32',
+      NSFileProtectionKey?:
+        |"NSFileProtectionNone"
+        | "NSFileProtectionComplete"
+        | "NSFileProtectionCompleteUnlessOpen"
+        | "NSFileProtectionCompleteUntilFirstUserAuthentication"
+        | "NSFileProtectionCompleteWhenUserInactive" // iOS 17+ only
+    };
+```
 
 Note: `float32` size is 4 bytes, so `position` should be specified in bytes (multiplied by 4)
 
-### `moveFile(filepath: string, destPath: string): void`
+(IOS only): `options.NSFileProtectionKey` property can be provided to set this attribute on iOS platforms.
+
+### `moveFile(filepath: string, destPath: string, options?: MoveCopyOptions): void`
 
 Moves the file located at `filepath` to `destPath`. This is more performant than reading and then re-writing the file data because the move is done natively and the data doesn't have to be copied or cross the bridge.
 
+```ts
+type MoveCopyOptions =
+  | {
+      NSFileProtectionKey?:
+        |"NSFileProtectionNone"
+        | "NSFileProtectionComplete"
+        | "NSFileProtectionCompleteUnlessOpen"
+        | "NSFileProtectionCompleteUntilFirstUserAuthentication"
+        | "NSFileProtectionCompleteWhenUserInactive" // iOS 17+ only
+    };
+```
+
 Note: Overwrites existing file
 
-### `copyFolder(srcFolderPath: string, destFolderPath: string): void`
+(IOS only): `options.NSFileProtectionKey` property can be provided to set this attribute on iOS platforms.
+
+### `copyFolder(srcFolderPath: string, destFolderPath: string, options?: MoveCopyOptions): void`
 
 Copies the contents located at `srcFolderPath` to `destFolderPath`.
 
+```ts
+type MoveCopyOptions =
+  | {
+      NSFileProtectionKey?:
+        |"NSFileProtectionNone"
+        | "NSFileProtectionComplete"
+        | "NSFileProtectionCompleteUnlessOpen"
+        | "NSFileProtectionCompleteUntilFirstUserAuthentication"
+        | "NSFileProtectionCompleteWhenUserInactive" // iOS 17+ only
+    };
+```
+
 Note: Recursively replaces all files and folders
 
-### `copyFile(filepath: string, destPath: string): void`
+(IOS only): `options.NSFileProtectionKey` property can be provided to set this attribute on iOS platforms.
+
+### `copyFile(filepath: string, destPath: string, options?: MoveCopyOptions): void`
 
 Copies the file located at `filepath` to `destPath`.
 
+```ts
+type MoveCopyOptions =
+  | {
+      NSFileProtectionKey?:
+        |"NSFileProtectionNone"
+        | "NSFileProtectionComplete"
+        | "NSFileProtectionCompleteUnlessOpen"
+        | "NSFileProtectionCompleteUntilFirstUserAuthentication"
+        | "NSFileProtectionCompleteWhenUserInactive" // iOS 17+ only
+    };
+```
+
 Note: Error will be thrown if the file already exists.
 
+(IOS only): `options.NSFileProtectionKey` property can be provided to set this attribute on iOS platforms.
+
 ### (Android only) `copyFileAssets(filepath: string, destPath: string): void`
 
 Copies the file at `filepath` in the Android app's assets folder and copies it to the given `destPath ` path.
@@ -449,12 +563,20 @@ Note: `ctime` no longer supported
 Create a directory at `filepath`. Automatically creates parents and does not throw if already exists (works like Linux `mkdir -p`).
 
 ```ts
-type MkdirOptions = {
-  NSURLIsExcludedFromBackupKey?: boolean; // iOS only
-};
+type MkdirOptions =
+  | {
+      NSFileProtectionKey?:
+        |"NSFileProtectionNone"
+        | "NSFileProtectionComplete"
+        | "NSFileProtectionCompleteUnlessOpen"
+        | "NSFileProtectionCompleteUntilFirstUserAuthentication"
+        | "NSFileProtectionCompleteWhenUserInactive"; // iOS 17+ only
+      NSURLIsExcludedFromBackupKey?: boolean;
+    };
 ```
 
-(IOS only): The `NSURLIsExcludedFromBackupKey` property can be provided to set this attribute on iOS platforms. Apple will *reject* apps for storing offline cache data that does not have this attribute.
+(IOS only): `options.NSFileProtectionKey` property can be provided to set this attribute on iOS platforms.
+(IOS only): The `options.NSURLIsExcludedFromBackupKey` property can be provided to set this attribute on iOS platforms. Apple will *reject* apps for storing offline cache data that does not have this attribute.
 
 ### `downloadFile(options: DownloadFileOptions, completeCallback?: DownloadResultFunc, errorCallback?: DownloadErrorFunc): DownloadResult | Promise<DownloadResult>`
 

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);
 }