diff --git a/interfaces/kits/js/BUILD.gn b/interfaces/kits/js/BUILD.gn
index 25490bdae2d0b61f8257daa2893ff5834636b483..645ed82ba8c0cfc0b754d203b046822f3e5d6cd8 100644
--- a/interfaces/kits/js/BUILD.gn
+++ b/interfaces/kits/js/BUILD.gn
@@ -835,6 +835,7 @@ ohos_shared_library("ani_file_fs") {
     cfi_cross_dso = true
     debug = false
   }
+  shlib_type = "ani"
   output_extension = "so"
   subsystem_name = "filemanagement"
   part_name = "file_api"
@@ -905,6 +906,7 @@ ohos_shared_library("ani_file_hash") {
     cfi_cross_dso = true
     debug = false
   }
+  shlib_type = "ani"
   output_extension = "so"
   subsystem_name = "filemanagement"
   part_name = "file_api"
@@ -969,6 +971,7 @@ ohos_shared_library("ani_file_securitylabel") {
     cfi_cross_dso = true
     debug = false
   }
+  shlib_type = "ani"
   output_extension = "so"
   subsystem_name = "filemanagement"
   part_name = "file_api"
@@ -1035,6 +1038,7 @@ ohos_shared_library("ani_file_environment") {
     cfi_cross_dso = true
     debug = false
   }
+  shlib_type = "ani"
   output_extension = "so"
   subsystem_name = "filemanagement"
   part_name = "file_api"
@@ -1101,6 +1105,7 @@ ohos_shared_library("ani_file_statvfs") {
     cfi_cross_dso = true
     debug = false
   }
+  shlib_type = "ani"
   output_extension = "so"
   subsystem_name = "filemanagement"
   part_name = "file_api"
diff --git a/interfaces/kits/js/src/common/ani_helper/ani_signature.cpp b/interfaces/kits/js/src/common/ani_helper/ani_signature.cpp
index a632f6f88bcf3f525da01aee43c3fec964e25f29..0080316068b5006c6e81df9c6d7830f216db9c33 100644
--- a/interfaces/kits/js/src/common/ani_helper/ani_signature.cpp
+++ b/interfaces/kits/js/src/common/ani_helper/ani_signature.cpp
@@ -106,7 +106,9 @@ const string FS::StreamInner::ctorSig = Builder::BuildSignatureDescriptor({ Basi
 // FS::TaskSignal
 const Type FS::TaskSignal::classType = Builder::BuildClass("@ohos.file.fs.fileIo.TaskSignal");
 const string FS::TaskSignal::classDesc = FS::TaskSignal::classType.Descriptor();
-const string FS::TaskSignal::ctorSig = Builder::BuildSignatureDescriptor({ BasicTypes::longType });
+const string FS::TaskSignal::ctorDesc = Builder::BuildConstructorName();
+const string FS::TaskSignal::ctorSig = Builder::BuildSignatureDescriptor({});
+const string FS::TaskSignal::nativeTaskSignal = "nativeTaskSignal";
 // FS::WatcherInner
 const Type FS::WatcherInner::classType = Builder::BuildClass("@ohos.file.fs.fileIo.WatcherInner");
 const string FS::WatcherInner::classDesc = FS::WatcherInner::classType.Descriptor();
diff --git a/interfaces/kits/js/src/common/ani_helper/ani_signature.h b/interfaces/kits/js/src/common/ani_helper/ani_signature.h
index 3938f3fb85e10d82ecb19701ace14276ad983376..e27e81c2cb815527d2590d79cab064d03f02e8fc 100644
--- a/interfaces/kits/js/src/common/ani_helper/ani_signature.h
+++ b/interfaces/kits/js/src/common/ani_helper/ani_signature.h
@@ -162,7 +162,9 @@ struct StreamInner : public BaseType {
 struct TaskSignal : public BaseType {
     static const Type classType;
     static const string classDesc;
+    static const string ctorDesc;
     static const string ctorSig;
+    static const string nativeTaskSignal;
 };
 
 struct WatcherInner : public BaseType {
diff --git a/interfaces/kits/js/src/common/ani_helper/type_converter.cpp b/interfaces/kits/js/src/common/ani_helper/type_converter.cpp
index 662006f953758d7a46e3c4f93c76cbf5a17bcd2d..cbafc941ea0edea666c611a27091d8b5a64b684a 100644
--- a/interfaces/kits/js/src/common/ani_helper/type_converter.cpp
+++ b/interfaces/kits/js/src/common/ani_helper/type_converter.cpp
@@ -295,7 +295,9 @@ std::tuple<bool, ani_array> TypeConverter::ToAniStringList(
     }
 
     ani_array result = nullptr;
-    if (env->Array_New(length, nullptr, &result) != ANI_OK) {
+    ani_ref undefined;
+    env->GetUndefined(&undefined);
+    if (env->Array_New(length, undefined, &result) != ANI_OK) {
         return { false, result };
     }
     for (uint32_t i = 0; i < length; i++) {
diff --git a/interfaces/kits/js/src/mod_fs/ani/bind_function_class.cpp b/interfaces/kits/js/src/mod_fs/ani/bind_function_class.cpp
index cec91441f4d040c8fcdfe3c8efd4c4af5eeb1ccf..d6221d30ca707bc3e12b260f1869f6441fadfa15 100644
--- a/interfaces/kits/js/src/mod_fs/ani/bind_function_class.cpp
+++ b/interfaces/kits/js/src/mod_fs/ani/bind_function_class.cpp
@@ -155,10 +155,13 @@ static ani_status BindStreamMethods(ani_env *env)
 static ani_status BindTaskSignalClassMethods(ani_env *env)
 {
     auto classDesc = FS::TaskSignal::classDesc.c_str();
+    auto ctorDesc = FS::TaskSignal::ctorDesc.c_str();
+    auto ctorSig = FS::TaskSignal::ctorSig.c_str();
 
     std::array methods = {
         ani_native_function { "cancel", nullptr, reinterpret_cast<void *>(TaskSignalAni::Cancel) },
         ani_native_function { "onCancelNative", nullptr, reinterpret_cast<void *>(TaskSignalAni::OnCancel) },
+        ani_native_function { ctorDesc, ctorSig, reinterpret_cast<void *>(TaskSignalAni::Constructor) },
     };
 
     return BindClass(env, classDesc, methods);
diff --git a/interfaces/kits/js/src/mod_fs/ani/ets/@ohos.file.fs.ets b/interfaces/kits/js/src/mod_fs/ani/ets/@ohos.file.fs.ets
index ee6be66d5a913dac4d46191cb7135bf55eee7c44..5d71a03b1806f9abb0e0c393e17099c84a3dec1a 100644
--- a/interfaces/kits/js/src/mod_fs/ani/ets/@ohos.file.fs.ets
+++ b/interfaces/kits/js/src/mod_fs/ani/ets/@ohos.file.fs.ets
@@ -1254,7 +1254,7 @@ export type ProgressListener = (progress: Progress) => void;
 
 export class TaskSignal {
   private nativeTaskSignal: long = 0;
-
+  native constructor();
   private native onCancelNative(): void;
 
   private onCancelResolve: (path: string) => void = (path: string): void => {};
diff --git a/interfaces/kits/js/src/mod_fs/class_tasksignal/ani/task_signal_ani.cpp b/interfaces/kits/js/src/mod_fs/class_tasksignal/ani/task_signal_ani.cpp
index 2b1229a6947fdefd5f18346d83760f2ca312781e..da5b27fa8537225400fbc81cea4f07f3fef0f38a 100644
--- a/interfaces/kits/js/src/mod_fs/class_tasksignal/ani/task_signal_ani.cpp
+++ b/interfaces/kits/js/src/mod_fs/class_tasksignal/ani/task_signal_ani.cpp
@@ -20,6 +20,7 @@
 #include "error_handler.h"
 #include "filemgmt_libhilog.h"
 #include "fs_task_signal.h"
+#include "task_signal_listener_ani.h"
 #include "task_signal_wrapper.h"
 #include "type_converter.h"
 
@@ -30,6 +31,30 @@ namespace ANI {
 using namespace std;
 using namespace OHOS::FileManagement::ModuleFileIO;
 
+void TaskSignalAni::Constructor(ani_env *env, ani_object signalObj)
+{
+    auto taskSignal = CreateSharedPtr<TaskSignal>();
+    if (taskSignal == nullptr) {
+        HILOGE("Failed to request heap memory.");
+        return;
+    }
+
+    ani_vm *vm = nullptr;
+    env->GetVM(&vm);
+    auto listener = CreateUniquePtr<TaskSignalListenerAni>(vm, signalObj, taskSignal);
+    if (listener == nullptr) {
+        HILOGE("Failed to request heap memory.");
+        return ;
+    }
+
+    FsResult<unique_ptr<FsTaskSignal>> result = FsTaskSignal::Constructor(move(taskSignal), move(listener));
+    if (!result.IsSuccess()) {
+        HILOGE("Failed to FsTaskSignal::Constructor");
+        return ;
+    }
+    TaskSignalWrapper::Wrap(env, signalObj, move(result.GetData().value()));
+}
+
 void TaskSignalAni::Cancel(ani_env *env, [[maybe_unused]] ani_object object)
 {
     FsTaskSignal *copySignal = TaskSignalWrapper::Unwrap(env, object);
diff --git a/interfaces/kits/js/src/mod_fs/class_tasksignal/ani/task_signal_ani.h b/interfaces/kits/js/src/mod_fs/class_tasksignal/ani/task_signal_ani.h
index d27e5253882fa7fae16a068317cf914a75a03202..c2d9a0901e6528ee971efbf9ff1e541bd147c740 100644
--- a/interfaces/kits/js/src/mod_fs/class_tasksignal/ani/task_signal_ani.h
+++ b/interfaces/kits/js/src/mod_fs/class_tasksignal/ani/task_signal_ani.h
@@ -25,6 +25,7 @@ namespace ANI {
 
 class TaskSignalAni final {
 public:
+    static void Constructor(ani_env *env, ani_object obj);
     static void Cancel(ani_env *env, [[maybe_unused]] ani_object object);
     static void OnCancel(ani_env *env, [[maybe_unused]] ani_object object);
 };
diff --git a/interfaces/kits/js/src/mod_fs/class_tasksignal/ani/task_signal_listener_ani.cpp b/interfaces/kits/js/src/mod_fs/class_tasksignal/ani/task_signal_listener_ani.cpp
index 8f533889c3ee78210c3aa97f09b4b74a120da02c..f5cbf4a50bae7ccfe1d7d4e99a30d18d514d53e8 100644
--- a/interfaces/kits/js/src/mod_fs/class_tasksignal/ani/task_signal_listener_ani.cpp
+++ b/interfaces/kits/js/src/mod_fs/class_tasksignal/ani/task_signal_listener_ani.cpp
@@ -26,8 +26,26 @@ namespace OHOS::FileManagement::ModuleFileIO::ANI {
 using namespace std;
 using namespace OHOS::FileManagement::ModuleFileIO::ANI::AniSignature;
 
+bool TaskSignalListenerAni::CreateGlobalReference()
+{
+    if (signalRef) {
+        return true;
+    }
+    ani_env *env = AniHelper::GetThreadEnv(vm);
+    int ret = 0;
+    if ((ret = env->GlobalReference_Create(static_cast<ani_ref>(signalObj), &signalRef)) != ANI_OK) {
+        HILOGE("TaskSignalListenerAni GlobalReference_Create failed: %{public}d", ret);
+        signalRef = nullptr;
+        return false;
+    }
+    return true;
+}
+
 void TaskSignalListenerAni::OnCancel()
 {
+    if (!CreateGlobalReference()) {
+        return;
+    }
     auto filepath = taskSignal->filePath_;
     auto task = [this, filepath]() { SendCancelEvent(filepath); };
     AniHelper::SendEventToMainThread(task);
@@ -39,8 +57,8 @@ void TaskSignalListenerAni::SendCancelEvent(const string &filepath) const
         HILOGE("Cannot send cancel event because the vm is null.");
         return;
     }
-    if (signalObj == nullptr) {
-        HILOGE("Cannot send cancel event because the signalObj is null.");
+    if (signalRef == nullptr) {
+        HILOGE("Cannot send cancel event because the signalRef is null.");
         return;
     }
     ani_env *env = AniHelper::GetThreadEnv(vm);
@@ -53,11 +71,25 @@ void TaskSignalListenerAni::SendCancelEvent(const string &filepath) const
         HILOGE("Cannot convert filepath to ani string!");
         return;
     }
-    auto ret = env->Object_CallMethodByName_Void(signalObj, "onCancelCallback", nullptr, aniPath);
+
+    auto ret = env->Object_CallMethodByName_Void(static_cast<ani_object>(signalRef), "onCancelCallback", nullptr,
+        aniPath);
     if (ret != ANI_OK) {
         HILOGE("Call onCancelCallback failed, err: %{public}d", ret);
         return;
     }
 }
 
+TaskSignalListenerAni::~TaskSignalListenerAni()
+{
+    if (signalRef == nullptr) {
+        return;
+    }
+    ani_env *env = AniHelper::GetThreadEnv(vm);
+    int ret = 0;
+    if ((ret = env->GlobalReference_Delete(signalRef)) != ANI_OK) {
+        HILOGE("TaskSignalListenerAni GlobalReference_Delete: %{public}d", ret);
+    }
+}
+
 } // namespace OHOS::FileManagement::ModuleFileIO::ANI
diff --git a/interfaces/kits/js/src/mod_fs/class_tasksignal/ani/task_signal_listener_ani.h b/interfaces/kits/js/src/mod_fs/class_tasksignal/ani/task_signal_listener_ani.h
index ae02a941eb6253816412bf12073cba68370c330b..ab84ded3828f54c1f49cc7f6380365d077bfe4f6 100644
--- a/interfaces/kits/js/src/mod_fs/class_tasksignal/ani/task_signal_listener_ani.h
+++ b/interfaces/kits/js/src/mod_fs/class_tasksignal/ani/task_signal_listener_ani.h
@@ -25,20 +25,22 @@ using namespace DistributedFS::ModuleTaskSignal;
 
 class TaskSignalListenerAni : public TaskSignalListener {
 public:
-    TaskSignalListenerAni(ani_vm *vm, const ani_object &signalObj, std::shared_ptr<TaskSignal> taskSignal)
-        : vm(vm), signalObj(signalObj), taskSignal(taskSignal) {}
+    TaskSignalListenerAni(ani_vm *vm, const ani_object &signalObject, std::shared_ptr<TaskSignal> taskSignal)
+        : vm(vm), signalObj(signalObject), taskSignal(taskSignal) {}
     void OnCancel() override;
 
 public:
     TaskSignalListenerAni() = default;
-    ~TaskSignalListenerAni() = default;
+    ~TaskSignalListenerAni();
 
 private:
     void SendCancelEvent(const std::string &filepath) const;
+    bool CreateGlobalReference();
 
 private:
     ani_vm *vm;
     ani_object signalObj;
+    ani_ref signalRef = nullptr;
     std::shared_ptr<TaskSignal> taskSignal;
 };
 
diff --git a/interfaces/kits/js/src/mod_fs/class_tasksignal/ani/task_signal_wrapper.cpp b/interfaces/kits/js/src/mod_fs/class_tasksignal/ani/task_signal_wrapper.cpp
index 79be6423190c34796a9b015ac57405afc7f0bda5..4ae2b06f4523a738cf93f278c6c4e3b24fc8a0fc 100644
--- a/interfaces/kits/js/src/mod_fs/class_tasksignal/ani/task_signal_wrapper.cpp
+++ b/interfaces/kits/js/src/mod_fs/class_tasksignal/ani/task_signal_wrapper.cpp
@@ -37,12 +37,12 @@ FsTaskSignal *TaskSignalWrapper::Unwrap(ani_env *env, ani_object object)
         HILOGE("Unwrap taskSignal obj failed! status: %{public}d", status);
         return nullptr;
     }
-    uintptr_t ptrValue = static_cast<uintptr_t>(nativePtr);
-    FsTaskSignal *copySignal = reinterpret_cast<FsTaskSignal *>(ptrValue);
+
+    FsTaskSignal *copySignal = reinterpret_cast<FsTaskSignal *>(nativePtr);
     return copySignal;
 }
 
-bool TaskSignalWrapper::Wrap(ani_env *env, ani_object object, const FsTaskSignal *signal)
+bool TaskSignalWrapper::Wrap(ani_env *env, ani_object object, unique_ptr<FsTaskSignal> signal)
 {
     if (object == nullptr) {
         HILOGE("TaskSignal obj is null!");
@@ -54,14 +54,14 @@ bool TaskSignalWrapper::Wrap(ani_env *env, ani_object object, const FsTaskSignal
         return false;
     }
 
-    ani_long ptr = static_cast<ani_long>(reinterpret_cast<std::uintptr_t>(signal));
+    ani_long ptr = reinterpret_cast<ani_long>(signal.get());
 
     auto status = env->Object_SetFieldByName_Long(object, "nativeTaskSignal", ptr);
     if (status != ANI_OK) {
         HILOGE("Wrap taskSignal obj failed! status: %{public}d", status);
         return false;
     }
-
+    signal.release();
     return true;
 }
 
diff --git a/interfaces/kits/js/src/mod_fs/class_tasksignal/ani/task_signal_wrapper.h b/interfaces/kits/js/src/mod_fs/class_tasksignal/ani/task_signal_wrapper.h
index 4fe9fb143277d646d0823d2234785d59d43beb89..7e3093994ac264b2e023f903dfe62a4a3464a19c 100644
--- a/interfaces/kits/js/src/mod_fs/class_tasksignal/ani/task_signal_wrapper.h
+++ b/interfaces/kits/js/src/mod_fs/class_tasksignal/ani/task_signal_wrapper.h
@@ -27,7 +27,7 @@ namespace ANI {
 class TaskSignalWrapper final {
 public:
     static FsTaskSignal *Unwrap(ani_env *env, ani_object object);
-    static bool Wrap(ani_env *env, ani_object object, const FsTaskSignal *signal);
+    static bool Wrap(ani_env *env, ani_object object, unique_ptr<FsTaskSignal> signal);
 };
 
 } // namespace ANI
diff --git a/interfaces/kits/js/src/mod_fs/class_tasksignal/fs_task_signal.cpp b/interfaces/kits/js/src/mod_fs/class_tasksignal/fs_task_signal.cpp
index d9b4b6ffe4608122c64ec35f99b2a6f6e1b598d2..bc2b2b4183353d048f3ace9912cd1c4745e3b4a2 100644
--- a/interfaces/kits/js/src/mod_fs/class_tasksignal/fs_task_signal.cpp
+++ b/interfaces/kits/js/src/mod_fs/class_tasksignal/fs_task_signal.cpp
@@ -24,25 +24,25 @@ namespace FileManagement {
 namespace ModuleFileIO {
 using namespace std;
 
-FsResult<shared_ptr<FsTaskSignal>> FsTaskSignal::Constructor(
+FsResult<unique_ptr<FsTaskSignal>> FsTaskSignal::Constructor(
     shared_ptr<TaskSignal> taskSignal, shared_ptr<TaskSignalListener> signalListener)
 {
     if (!taskSignal) {
         HILOGE("Invalid taskSignal");
-        return FsResult<shared_ptr<FsTaskSignal>>::Error(EINVAL);
+        return FsResult<unique_ptr<FsTaskSignal>>::Error(EINVAL);
     }
     if (!signalListener) {
         HILOGE("Invalid signalListener");
-        return FsResult<shared_ptr<FsTaskSignal>>::Error(EINVAL);
+        return FsResult<unique_ptr<FsTaskSignal>>::Error(EINVAL);
     }
-    auto copySignal = CreateSharedPtr<FsTaskSignal>();
+    auto copySignal = CreateUniquePtr<FsTaskSignal>();
     if (copySignal == nullptr) {
         HILOGE("Failed to request heap memory.");
-        return FsResult<shared_ptr<FsTaskSignal>>::Error(ENOMEM);
+        return FsResult<unique_ptr<FsTaskSignal>>::Error(ENOMEM);
     }
     copySignal->taskSignal_ = move(taskSignal);
     copySignal->signalListener_ = move(signalListener);
-    return FsResult<shared_ptr<FsTaskSignal>>::Success(copySignal);
+    return FsResult<unique_ptr<FsTaskSignal>>::Success(move(copySignal));
 }
 
 FsResult<void> FsTaskSignal::Cancel()
@@ -74,6 +74,11 @@ shared_ptr<TaskSignal> FsTaskSignal::GetTaskSignal() const
     return taskSignal_;
 }
 
+FsTaskSignal::FsTaskSignal()
+{
+    taskSignal_ = CreateSharedPtr<TaskSignal>();
+}
+
 } // namespace ModuleFileIO
 } // namespace FileManagement
 } // namespace OHOS
\ No newline at end of file
diff --git a/interfaces/kits/js/src/mod_fs/class_tasksignal/fs_task_signal.h b/interfaces/kits/js/src/mod_fs/class_tasksignal/fs_task_signal.h
index 33161108c3b9c231d61d346682654c80fc97094d..87b7fbadfd28fbe9516c2f6aae34fbc2b2894fb5 100644
--- a/interfaces/kits/js/src/mod_fs/class_tasksignal/fs_task_signal.h
+++ b/interfaces/kits/js/src/mod_fs/class_tasksignal/fs_task_signal.h
@@ -27,14 +27,12 @@ using namespace DistributedFS::ModuleTaskSignal;
 
 class FsTaskSignal {
 public:
-    static FsResult<shared_ptr<FsTaskSignal>> Constructor(
+    static FsResult<unique_ptr<FsTaskSignal>> Constructor(
         shared_ptr<TaskSignal> taskSignal, shared_ptr<TaskSignalListener> signalListener);
     FsResult<void> Cancel();
     FsResult<void> OnCancel();
     shared_ptr<TaskSignal> GetTaskSignal() const;
-
-public:
-    FsTaskSignal() = default;
+    FsTaskSignal();
     ~FsTaskSignal() = default;
     FsTaskSignal(const FsTaskSignal &other) = delete;
     FsTaskSignal &operator=(const FsTaskSignal &other) = delete;
diff --git a/interfaces/kits/js/src/mod_fs/properties/ani/copy_ani.cpp b/interfaces/kits/js/src/mod_fs/properties/ani/copy_ani.cpp
index 541cd7f6c36b055ba7f46ca5ef25f2535a66bb98..6bca55f030ae20736be1ee5a11e15c203c6b2921 100644
--- a/interfaces/kits/js/src/mod_fs/properties/ani/copy_ani.cpp
+++ b/interfaces/kits/js/src/mod_fs/properties/ani/copy_ani.cpp
@@ -81,33 +81,11 @@ static bool ParseCopySignalFromOptionArg(ani_env *env, const ani_object &options
         return true;
     }
 
-    auto taskSignal = CreateSharedPtr<TaskSignal>();
-    if (taskSignal == nullptr) {
-        HILOGE("Failed to request heap memory.");
-        return false;
-    }
-
-    auto signalObj = static_cast<ani_object>(prog);
-    ani_vm *vm = nullptr;
-    env->GetVM(&vm);
-    auto listener = CreateSharedPtr<TaskSignalListenerAni>(vm, signalObj, taskSignal);
-    if (listener == nullptr) {
-        HILOGE("Failed to request heap memory.");
-        return false;
-    }
-
-    auto result = FsTaskSignal::Constructor(taskSignal, listener);
-    if (!result.IsSuccess()) {
-        return false;
-    }
-
-    auto copySignal = result.GetData().value();
-    auto succ = TaskSignalWrapper::Wrap(env, signalObj, copySignal.get());
-    if (!succ) {
-        return false;
+    FsTaskSignal *copySignal = TaskSignalWrapper::Unwrap(env, static_cast<ani_object>(prog));
+    if (copySignal != nullptr) {
+        opts.copySignal = copySignal;
     }
 
-    opts.copySignal = move(copySignal);
     return true;
 }
 
diff --git a/interfaces/kits/js/src/mod_fs/properties/ani/listfile_ani.cpp b/interfaces/kits/js/src/mod_fs/properties/ani/listfile_ani.cpp
index 79a94260deb339a9259a643134bd87449b8f4abb..84dd373c18c0a24b82150c56f31084059454fa98 100644
--- a/interfaces/kits/js/src/mod_fs/properties/ani/listfile_ani.cpp
+++ b/interfaces/kits/js/src/mod_fs/properties/ani/listfile_ani.cpp
@@ -129,8 +129,8 @@ tuple<bool, optional<vector<string>>> ParseArrayString(ani_env *env, ani_object
         return { true, nullopt };
     }
 
-    ani_double length;
-    if (ANI_OK != env->Object_GetPropertyByName_Double(
+    ani_int length;
+    if (ANI_OK != env->Object_GetPropertyByName_Int(
         static_cast<ani_object>(resultRef), "length", &length) || length == 0) {
         return { false, nullopt };
     }
diff --git a/interfaces/kits/js/src/mod_fs/properties/copy_core.cpp b/interfaces/kits/js/src/mod_fs/properties/copy_core.cpp
index 45403ca6d82752fcac6b36e2cf72b2f063305337..6e6c2b73209993544c51b6174597702adfb663c0 100644
--- a/interfaces/kits/js/src/mod_fs/properties/copy_core.cpp
+++ b/interfaces/kits/js/src/mod_fs/properties/copy_core.cpp
@@ -774,7 +774,7 @@ tuple<int, std::shared_ptr<FsFileInfos>> CopyCore::CreateFileInfos(
         }
         auto copySignal = options.value().copySignal;
         if (copySignal) {
-            infos->taskSignal = copySignal->GetTaskSignal();
+            infos->taskSignal = copySignal->GetTaskSignal().get();
         }
     }
 
diff --git a/interfaces/kits/js/src/mod_fs/properties/copy_core.h b/interfaces/kits/js/src/mod_fs/properties/copy_core.h
index 38779226062c433f42bc60b371d88aa76e463e87..fb30c4048cd43cd9d6eb62e193550941534023e4 100644
--- a/interfaces/kits/js/src/mod_fs/properties/copy_core.h
+++ b/interfaces/kits/js/src/mod_fs/properties/copy_core.h
@@ -36,8 +36,8 @@ using namespace OHOS::AppExecFwk;
 using namespace DistributedFS::ModuleTaskSignal;
 
 struct CopyOptions {
-    std::shared_ptr<IProgressListener> progressListener;
-    std::shared_ptr<FsTaskSignal> copySignal;
+    shared_ptr<IProgressListener> progressListener;
+    FsTaskSignal* copySignal = nullptr;
 };
 
 struct ReceiveInfo {
@@ -96,7 +96,7 @@ struct FsFileInfos {
     bool run = true;
     bool hasListener = false;
     std::shared_ptr<IProgressListener> listener = nullptr;
-    std::shared_ptr<TaskSignal> taskSignal = nullptr;
+    TaskSignal* taskSignal = nullptr;
     std::set<std::string> filePaths;
     int exceptionCode = ERRNO_NOERR; // notify copy thread or listener thread has exceptions.
     bool operator==(const FsFileInfos &infos) const
diff --git a/interfaces/kits/js/src/mod_fs/properties/dup.cpp b/interfaces/kits/js/src/mod_fs/properties/dup.cpp
index 77d71f7384a35fdd90da992eb92e5b4d5c824225..de2de57d37c2a1b8361bd4d21fd72a67690f3936 100644
--- a/interfaces/kits/js/src/mod_fs/properties/dup.cpp
+++ b/interfaces/kits/js/src/mod_fs/properties/dup.cpp
@@ -51,6 +51,7 @@ napi_value Dup::Sync(napi_env env, napi_callback_info info)
         new (std::nothrow) uv_fs_t, CommonFunc::fs_req_cleanup };
     if (!readlink_req) {
         HILOGE("Failed to request heap memory.");
+        close(dstFd);
         NError(ENOMEM).ThrowErr(env);
         return nullptr;
     }
@@ -58,6 +59,7 @@ napi_value Dup::Sync(napi_env env, napi_callback_info info)
     int ret = uv_fs_readlink(nullptr, readlink_req.get(), path.c_str(), nullptr);
     if (ret < 0) {
         HILOGE("Failed to readlink fd, ret: %{public}d", ret);
+        close(dstFd);
         NError(ret).ThrowErr(env);
         return nullptr;
     }
diff --git a/interfaces/kits/js/src/mod_fs/properties/dup_core.cpp b/interfaces/kits/js/src/mod_fs/properties/dup_core.cpp
index 7162051499842faad86ee99d5b1a9f176ca5756b..17d099d130b07f1edfefb04f1ee75d9a95bc2f94 100644
--- a/interfaces/kits/js/src/mod_fs/properties/dup_core.cpp
+++ b/interfaces/kits/js/src/mod_fs/properties/dup_core.cpp
@@ -52,12 +52,14 @@ FsResult<FsFile *> DupCore::DoDup(const int32_t &fd)
         new (std::nothrow) uv_fs_t, FsUtils::FsReqCleanup };
     if (!readLinkReq) {
         HILOGE("Failed to request heap memory.");
+        close(dstFd);
         return FsResult<FsFile *>::Error(ENOMEM);
     }
     string path = "/proc/self/fd/" + to_string(dstFd);
     int ret = uv_fs_readlink(nullptr, readLinkReq.get(), path.c_str(), nullptr);
     if (ret < 0) {
         HILOGE("Failed to readlink fd, ret: %{public}d", ret);
+        close(dstFd);
         return FsResult<FsFile *>::Error(ret);
     }
     return FileInstantiator::InstantiateFile(dstFd, string(static_cast<const char *>(readLinkReq->ptr)), false);
diff --git a/interfaces/test/unittest/js/BUILD.gn b/interfaces/test/unittest/js/BUILD.gn
index d7b5876fc8365b8a3f176f8316eaa7cb670a0452..069ac9f9824d41352775a81321635ff848d4113b 100644
--- a/interfaces/test/unittest/js/BUILD.gn
+++ b/interfaces/test/unittest/js/BUILD.gn
@@ -14,15 +14,23 @@
 import("//build/test.gni")
 import("//foundation/filemanagement/file_api/file_api.gni")
 
+ani_file_environment_core = [
+  "${src_path}/common/file_helper/fd_guard.cpp",
+  "${src_path}/mod_environment/environment_core.cpp",
+  "${src_path}/mod_fs/fs_utils.cpp",
+]
 ohos_unittest("ani_file_environment_test") {
   branch_protector_ret = "pac_ret"
   testonly = true
 
   module_out_path = "file_api/file_api"
   include_dirs = [
+    "${file_api_path}/interfaces/kits/js/src/common",
+    "${file_api_path}/interfaces/kits/js/src/common/file_helper",
+    "${file_api_path}/interfaces/kits/js/src/mod_fs",
+    "${file_api_path}/interfaces/test/unittest/js/mod_environment/mock",
     "${src_path}/mod_environment",
     "${src_path}/mod_environment/ani",
-    "${file_api_path}/interfaces/test/unittest/js/mod_environment/mock",
   ]
 
   sources = [
@@ -31,9 +39,9 @@ ohos_unittest("ani_file_environment_test") {
     "mod_environment/mock/ipc_skeleton_mock.cpp",
     "mod_environment/mock/parameter_mock.cpp",
   ]
+  sources += ani_file_environment_core
 
   deps = [
-    "${file_api_path}/interfaces/kits/js:ani_file_environment",
     "${utils_path}/filemgmt_libfs:filemgmt_libfs",
     "${utils_path}/filemgmt_libhilog:filemgmt_libhilog",
   ]
@@ -56,6 +64,59 @@ ohos_unittest("ani_file_environment_test") {
   defines = [ "private=public" ]
 }
 
+ani_file_fs_core = [
+  "${src_path}/common/file_helper/fd_guard.cpp",
+  "${src_path}/mod_fs/class_atomicfile/fs_atomicfile.cpp",
+  "${src_path}/mod_fs/class_file/file_instantiator.cpp",
+  "${src_path}/mod_fs/class_file/fs_file.cpp",
+  "${src_path}/mod_fs/class_randomaccessfile/fs_randomaccessfile.cpp",
+  "${src_path}/mod_fs/class_readeriterator/fs_reader_iterator.cpp",
+  "${src_path}/mod_fs/class_stat/fs_stat.cpp",
+  "${src_path}/mod_fs/class_stat/stat_instantiator.cpp",
+  "${src_path}/mod_fs/class_stream/fs_stream.cpp",
+  "${src_path}/mod_fs/class_stream/stream_instantiator.cpp",
+  "${src_path}/mod_fs/class_tasksignal/fs_task_signal.cpp",
+  "${src_path}/mod_fs/class_watcher/fs_file_watcher.cpp",
+  "${src_path}/mod_fs/class_watcher/fs_watcher.cpp",
+  "${src_path}/mod_fs/class_watcher/watcher_data_cache.cpp",
+  "${src_path}/mod_fs/fs_utils.cpp",
+  "${src_path}/mod_fs/properties/access_core.cpp",
+  "${src_path}/mod_fs/properties/close_core.cpp",
+  "${src_path}/mod_fs/properties/connectdfs_core.cpp",
+  "${src_path}/mod_fs/properties/copy_core.cpp",
+  "${src_path}/mod_fs/properties/copy_dir_core.cpp",
+  "${src_path}/mod_fs/properties/copy_file_core.cpp",
+  "${src_path}/mod_fs/properties/copy_listener/trans_listener_core.cpp",
+  "${src_path}/mod_fs/properties/create_randomaccessfile_core.cpp",
+  "${src_path}/mod_fs/properties/create_stream_core.cpp",
+  "${src_path}/mod_fs/properties/dfs_listener/file_dfs_listener_stub.cpp",
+  "${src_path}/mod_fs/properties/disconnectdfs_core.cpp",
+  "${src_path}/mod_fs/properties/dup_core.cpp",
+  "${src_path}/mod_fs/properties/fdatasync_core.cpp",
+  "${src_path}/mod_fs/properties/fdopen_stream_core.cpp",
+  "${src_path}/mod_fs/properties/fsync_core.cpp",
+  "${src_path}/mod_fs/properties/listfile_core.cpp",
+  "${src_path}/mod_fs/properties/lseek_core.cpp",
+  "${src_path}/mod_fs/properties/lstat_core.cpp",
+  "${src_path}/mod_fs/properties/mkdir_core.cpp",
+  "${src_path}/mod_fs/properties/mkdtemp_core.cpp",
+  "${src_path}/mod_fs/properties/move_core.cpp",
+  "${src_path}/mod_fs/properties/movedir_core.cpp",
+  "${src_path}/mod_fs/properties/open_core.cpp",
+  "${src_path}/mod_fs/properties/read_core.cpp",
+  "${src_path}/mod_fs/properties/read_lines_core.cpp",
+  "${src_path}/mod_fs/properties/read_text_core.cpp",
+  "${src_path}/mod_fs/properties/rename_core.cpp",
+  "${src_path}/mod_fs/properties/rmdir_core.cpp",
+  "${src_path}/mod_fs/properties/stat_core.cpp",
+  "${src_path}/mod_fs/properties/symlink_core.cpp",
+  "${src_path}/mod_fs/properties/truncate_core.cpp",
+  "${src_path}/mod_fs/properties/unlink_core.cpp",
+  "${src_path}/mod_fs/properties/utimes_core.cpp",
+  "${src_path}/mod_fs/properties/watcher_core.cpp",
+  "${src_path}/mod_fs/properties/write_core.cpp",
+  "${src_path}/mod_fs/properties/xattr_core.cpp",
+]
 ohos_unittest("ani_file_fs_mock_test") {
   branch_protector_ret = "pac_ret"
   testonly = true
@@ -63,6 +124,9 @@ ohos_unittest("ani_file_fs_mock_test") {
   module_out_path = "file_api/file_api"
 
   include_dirs = [
+    "${file_api_path}/interfaces/kits/js/src/common",
+    "${file_api_path}/interfaces/kits/js/src/common/file_helper",
+    "${file_api_path}/interfaces/kits/js/src/mod_fs",
     "${file_api_path}/interfaces/kits/js/src/mod_fs/class_atomicfile",
     "${file_api_path}/interfaces/kits/js/src/mod_fs/class_file",
     "${file_api_path}/interfaces/kits/js/src/mod_fs/class_randomaccessfile",
@@ -119,9 +183,9 @@ ohos_unittest("ani_file_fs_mock_test") {
     "mod_fs/properties/write_core_mock_test.cpp",
     "mod_fs/properties/xattr_core_mock_test.cpp",
   ]
+  sources += ani_file_fs_core
 
   deps = [
-    "${file_api_path}/interfaces/kits/js:ani_file_fs",
     "${file_api_path}/interfaces/kits/native:remote_uri_native",
     "${file_api_path}/interfaces/kits/native:task_signal_native",
     "${file_api_path}/interfaces/kits/rust:rust_file",
@@ -133,11 +197,14 @@ ohos_unittest("ani_file_fs_mock_test") {
     "ability_runtime:ability_manager",
     "app_file_service:fileuri_native",
     "c_utils:utils",
+    "data_share:datashare_common",
+    "data_share:datashare_consumer",
     "dfs_service:distributed_file_daemon_kit_inner",
     "dfs_service:libdistributedfileutils",
     "googletest:gmock_main",
     "googletest:gtest_main",
     "hilog:libhilog",
+    "hisysevent:libhisysevent",
     "ipc:ipc_core",
     "libuv:uv",
   ]
@@ -159,6 +226,10 @@ ohos_unittest("ani_file_fs_test") {
   resource_config_file = "../resource/ohos_test.xml"
 
   include_dirs = [
+    "${file_api_path}/interfaces/kits/js/src/common",
+    "${file_api_path}/interfaces/kits/js/src/common/file_helper",
+    "${file_api_path}/interfaces/kits/js/src/mod_fs",
+    "${file_api_path}/interfaces/kits/js/src/mod_fs/class_watcher",
     "${file_api_path}/interfaces/kits/js/src/mod_fs/class_atomicfile",
     "${file_api_path}/interfaces/kits/js/src/mod_fs/class_file",
     "${file_api_path}/interfaces/kits/js/src/mod_fs/class_randomaccessfile",
@@ -204,9 +275,9 @@ ohos_unittest("ani_file_fs_test") {
     "mod_fs/properties/write_core_test.cpp",
     "mod_fs/properties/xattr_core_test.cpp",
   ]
+  sources += ani_file_fs_core
 
   deps = [
-    "${file_api_path}/interfaces/kits/js:ani_file_fs",
     "${file_api_path}/interfaces/kits/native:remote_uri_native",
     "${file_api_path}/interfaces/kits/native:task_signal_native",
     "${file_api_path}/interfaces/kits/rust:rust_file",
@@ -218,10 +289,13 @@ ohos_unittest("ani_file_fs_test") {
     "ability_runtime:ability_manager",
     "app_file_service:fileuri_native",
     "c_utils:utils",
+    "data_share:datashare_common",
+    "data_share:datashare_consumer",
     "dfs_service:distributed_file_daemon_kit_inner",
     "dfs_service:libdistributedfileutils",
     "googletest:gtest_main",
     "hilog:libhilog",
+    "hisysevent:libhisysevent",
     "ipc:ipc_core",
     "libuv:uv",
   ]
@@ -229,20 +303,31 @@ ohos_unittest("ani_file_fs_test") {
   defines = [ "private=public" ]
 }
 
+ani_file_hash_core = [
+  "${src_path}/common/file_helper/fd_guard.cpp",
+  "${src_path}/common/file_helper/hash_file.cpp",
+  "${src_path}/mod_fs/fs_utils.cpp",
+  "${src_path}/mod_hash/class_hashstream/hs_hashstream.cpp",
+  "${src_path}/mod_hash/hash_core.cpp",
+]
+
 ohos_unittest("ani_file_hash_test") {
   module_out_path = "file_api/file_api"
 
   resource_config_file = "../resource/ohos_test.xml"
 
   sources = [ "mod_hash/hash_core_test.cpp" ]
+  sources += ani_file_hash_core
 
   include_dirs = [
     "mock/libuv",
+    "${file_api_path}/interfaces/kits/js/src/common",
+    "${file_api_path}/interfaces/kits/js/src/common/file_helper",
+    "${file_api_path}/interfaces/kits/js/src/mod_fs",
     "${file_api_path}/interfaces/kits/js/src/mod_hash",
   ]
 
   deps = [
-    "${file_api_path}/interfaces/kits/js:ani_file_hash",
     "${utils_path}/filemgmt_libfs:filemgmt_libfs",
     "${utils_path}/filemgmt_libhilog:filemgmt_libhilog",
   ]
@@ -253,23 +338,31 @@ ohos_unittest("ani_file_hash_test") {
     "googletest:gtest_main",
     "hilog:libhilog",
     "libuv:uv",
+    "openssl:libcrypto_shared",
   ]
 }
 
+ani_file_securitylabel_core = [
+  "${src_path}/common/file_helper/fd_guard.cpp",
+  "${src_path}/mod_fs/fs_utils.cpp",
+  "${src_path}/mod_securitylabel/securitylabel_core.cpp",
+]
 ohos_unittest("ani_file_securitylabel_test") {
   module_out_path = "file_api/file_api"
 
   resource_config_file = "../resource/ohos_test.xml"
 
   sources = [ "mod_securitylabel/securitylabel_core_test.cpp" ]
+  sources += ani_file_securitylabel_core
 
   include_dirs = [
     "mock/libuv",
+    "${file_api_path}/interfaces/kits/js/src/common",
+    "${file_api_path}/interfaces/kits/js/src/common/file_helper",
     "${file_api_path}/interfaces/kits/js/src/mod_securitylabel",
   ]
 
   deps = [
-    "${file_api_path}/interfaces/kits/js:ani_file_securitylabel",
     "${utils_path}/filemgmt_libfs:filemgmt_libfs",
     "${utils_path}/filemgmt_libhilog:filemgmt_libhilog",
   ]
@@ -283,20 +376,27 @@ ohos_unittest("ani_file_securitylabel_test") {
   ]
 }
 
+ani_file_statvfs_core = [
+  "${src_path}/common/file_helper/fd_guard.cpp",
+  "${src_path}/mod_fs/fs_utils.cpp",
+  "${src_path}/mod_statvfs/statvfs_core.cpp",
+]
 ohos_unittest("ani_file_statvfs_test") {
   module_out_path = "file_api/file_api"
 
   resource_config_file = "../resource/ohos_test.xml"
 
   sources = [ "mod_statvfs/statvfs_core_test.cpp" ]
+  sources += ani_file_statvfs_core
 
   include_dirs = [
     "mock/libuv",
+    "${file_api_path}/interfaces/kits/js/src/common",
+    "${file_api_path}/interfaces/kits/js/src/common/file_helper",
     "${file_api_path}/interfaces/kits/js/src/mod_statvfs",
   ]
 
   deps = [
-    "${file_api_path}/interfaces/kits/js:ani_file_statvfs",
     "${utils_path}/filemgmt_libfs:filemgmt_libfs",
     "${utils_path}/filemgmt_libhilog:filemgmt_libhilog",
   ]
diff --git a/interfaces/test/unittest/js/mod_fs/properties/copy_core_mock_test.cpp b/interfaces/test/unittest/js/mod_fs/properties/copy_core_mock_test.cpp
index 6e832264aaceae17bf33a0678fd5dbe2c7647f43..104552554fae45a27f09cdcbc71b313327336393 100644
--- a/interfaces/test/unittest/js/mod_fs/properties/copy_core_mock_test.cpp
+++ b/interfaces/test/unittest/js/mod_fs/properties/copy_core_mock_test.cpp
@@ -531,7 +531,7 @@ HWTEST_F(CopyCoreMockTest, CopyCoreMockTest_CreateFileInfos_001, testing::ext::T
     copySignal->taskSignal_ = std::make_shared<TaskSignal>();
     auto options = std::make_optional<CopyOptions>();
     options->progressListener = std::make_shared<MockProgressListener>();
-    options->copySignal = std::move(copySignal);
+    options->copySignal = copySignal.get();
 
     auto [errCode, infos] = CopyCore::CreateFileInfos(srcFile, destFile, options);
     EXPECT_EQ(errCode, ERRNO_NOERR);