diff --git a/native/cocos/bindings/jswrapper/v8/Object.cpp b/native/cocos/bindings/jswrapper/v8/Object.cpp index 0bc93281fe..92b0424c9c 100644 --- a/native/cocos/bindings/jswrapper/v8/Object.cpp +++ b/native/cocos/bindings/jswrapper/v8/Object.cpp @@ -400,8 +400,8 @@ Object *Object::createJSONObject(const ccstd::string &jsonStr) { return Object::_createJSObject(nullptr, jsobj); } -Object *Object::createJSONObject(std::u16string &jsonStr) { - auto v8Str = v8::String::NewExternalTwoByte(__isolate, ccnew internal::ExternalStringResource(jsonStr)); +Object *Object::createJSONObject(std::u16string &&jsonStr) { + auto v8Str = v8::String::NewExternalTwoByte(__isolate, ccnew internal::ExternalStringResource(std::move(jsonStr))); if (v8Str.IsEmpty()) { return nullptr; } diff --git a/native/cocos/bindings/jswrapper/v8/Object.h b/native/cocos/bindings/jswrapper/v8/Object.h index 03e5ba64e7..7d3834bd58 100644 --- a/native/cocos/bindings/jswrapper/v8/Object.h +++ b/native/cocos/bindings/jswrapper/v8/Object.h @@ -159,7 +159,7 @@ public: * @return A JavaScript Object containing the parsed value, or nullptr if the input is invalid. * @note The return value (non-null) has to be released manually. In order to avoid memory copy, use std::u16string reference directly without const, after this method is invoked, jsonStr will be empty since it was moved. */ - static Object *createJSONObject(std::u16string &jsonStr); + static Object *createJSONObject(std::u16string &&jsonStr); /** * @brief Creates a JavaScript Native Binding Object from an existing se::Class instance. diff --git a/native/cocos/bindings/jswrapper/v8/Utils.h b/native/cocos/bindings/jswrapper/v8/Utils.h index 9b92bfb415..a906862ed3 100644 --- a/native/cocos/bindings/jswrapper/v8/Utils.h +++ b/native/cocos/bindings/jswrapper/v8/Utils.h @@ -52,7 +52,7 @@ void clearPrivate(v8::Isolate *isolate, ObjectWrap &wrap); class ExternalStringResource : public v8::String::ExternalStringResource { public: - explicit ExternalStringResource(std::u16string &s) + explicit ExternalStringResource(std::u16string &&s) : _s(std::move(s)) { } diff --git a/native/cocos/bindings/manual/jsb_cocos_manual.cpp b/native/cocos/bindings/manual/jsb_cocos_manual.cpp index eb548f74f6..ec38981e78 100644 --- a/native/cocos/bindings/manual/jsb_cocos_manual.cpp +++ b/native/cocos/bindings/manual/jsb_cocos_manual.cpp @@ -27,10 +27,10 @@ #include "base/ThreadPool.h" #include "base/UTF8.h" -#include "bindings/manual/jsb_global.h" #include "bindings/auto/jsb_cocos_auto.h" #include "bindings/jswrapper/SeApi.h" #include "bindings/manual/jsb_conversions.h" +#include "bindings/manual/jsb_global.h" #include "bindings/manual/jsb_global_init.h" #include "application/ApplicationManager.h" @@ -356,7 +356,7 @@ static bool register_sys_localStorage(se::Object *obj) { // NOLINT(readability-i return true; } -//IDEA: move to auto bindings. +// IDEA: move to auto bindings. static bool js_CanvasRenderingContext2D_setCanvasBufferUpdatedCallback(se::State &s) { // NOLINT(readability-identifier-naming) auto *cobj = static_cast(s.nativeThisObject()); SE_PRECONDITION2(cobj, false, "Invalid Native Object"); @@ -653,7 +653,7 @@ static bool js_se_setExceptionCallback(se::State &s) { // NOLINT(readability-ide if (s.thisObject()) { s.thisObject()->attachObject(objFunc); // prevent GC } else { - //prevent GC in C++ & JS + // prevent GC in C++ & JS objFunc->root(); } @@ -675,8 +675,7 @@ static bool js_se_setExceptionCallback(se::State &s) { // NOLINT(readability-ide } SE_BIND_FUNC(js_se_setExceptionCallback) // NOLINT(readability-identifier-naming) -template -static bool js_readFile(se::State &s) { // NOLINT +static bool js_readFile_getParameters(se::State &s, ccstd::string &fullPath, std::shared_ptr &callbackPtr) { // NOLINT const auto &args = s.args(); size_t argc = args.size(); CC_UNUSED bool ok = true; @@ -688,8 +687,7 @@ static bool js_readFile(se::State &s) { // NOLINT const auto &callbackVal = args[1]; CC_ASSERT(callbackVal.isObject()); CC_ASSERT(callbackVal.toObject()->isFunction()); - - + if (path.empty()) { se::ValueArray seArgs; seArgs.reserve(2); @@ -699,103 +697,143 @@ static bool js_readFile(se::State &s) { // NOLINT return true; } - std::shared_ptr callbackPtr = std::make_shared(callbackVal); - + callbackPtr = std::make_shared(callbackVal); + // fullPathForFilename is not threadsafe, so don't invoke it in thread pool. - ccstd::string fullPath = cc::FileUtils::getInstance()->fullPathForFilename(path); - - gIOThreadPool->pushTask([fullPath, callbackPtr](int/* tid */) { - auto *fs = cc::FileUtils::getInstance(); - if (fs == nullptr) { - return; - } - - auto app = CC_CURRENT_APPLICATION(); - if (!app) { - return; - } - - auto content = std::make_shared(); - fs->getContents(fullPath, content.get()); - - auto engine = app->getEngine(); - if (!engine) { - return; - } - - std::shared_ptr u16str; - // TODO(cjh): OpenHarmony NAPI support -#if SCRIPT_ENGINE_TYPE != SCRIPT_ENGINE_NAPI - if constexpr (std::is_same_v && isJson) { - u16str = std::make_shared(); - if (!cc::StringUtils::UTF8ToUTF16(*content, *u16str)) { - CC_LOG_ERROR("UTF8ToUTF16 failed, file: %s", fullPath.c_str()); - } - } -#endif - - engine->getScheduler()->performFunctionInCocosThread([callbackPtr, content, u16str](){ - se::AutoHandleScope hs; - se::ValueArray seArgs; - seArgs.reserve(2); - - if constexpr (std::is_same_v) { - if constexpr (isJson) { -#if SCRIPT_ENGINE_TYPE == SCRIPT_ENGINE_NAPI - se::HandleObject jsonObj(se::Object::createJSONObject(*content)); -#else - se::HandleObject jsonObj(se::Object::createJSONObject(*u16str)); -#endif - if (!jsonObj.get()) { - seArgs.emplace_back(se::Value("Parse json failed!")); - seArgs.emplace_back(se::Value::Null); - } else { - seArgs.emplace_back(se::Value::Null); - seArgs.emplace_back(se::Value(jsonObj)); - } - callbackPtr->toObject()->call(seArgs, nullptr); - } else { - seArgs.emplace_back(se::Value::Null); - seArgs.emplace_back(se::Value(*content)); - callbackPtr->toObject()->call(seArgs, nullptr); - } - } else if constexpr (std::is_same_v) { - se::HandleObject dataObj(se::Object::createArrayBufferObject(content->getBytes(), content->getSize())); - seArgs.emplace_back(se::Value::Null); - seArgs.emplace_back(se::Value(dataObj)); - callbackPtr->toObject()->call(seArgs, nullptr); - } - }); - }); - + fullPath = cc::FileUtils::getInstance()->fullPathForFilename(path); return true; } SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 2); return false; } -static bool js_readTextFile(se::State &s) { // NOLINT - return js_readFile(s); -} -SE_BIND_FUNC(js_readTextFile) +template +struct ReadFileDoJobReturnType { + using value = std::shared_ptr; +}; -static bool js_readDataFile(se::State &s) { // NOLINT - return js_readFile(s); -} -SE_BIND_FUNC(js_readDataFile) +template <> +struct ReadFileDoJobReturnType { +#if SCRIPT_ENGINE_TYPE == SCRIPT_ENGINE_NAPI + using value = std::shared_ptr; +#else + using value = std::shared_ptr; +#endif +}; -static bool js_readJsonFile(se::State &s) { // NOLINT - return js_readFile(s); -} -SE_BIND_FUNC(js_readJsonFile) +template <> +struct ReadFileDoJobReturnType { + using value = std::shared_ptr; +}; +template +static bool js_readFile_doJob(const ccstd::string &fullPath, typename ReadFileDoJobReturnType::value &outValue) { + auto *fs = cc::FileUtils::getInstance(); + if (fs == nullptr) { + return false; + } + + auto content = std::make_shared(); + if (cc::FileUtils::Status::OK != fs->getContents(fullPath, content.get())) { + return false; + } + + // TODO(cjh): OpenHarmony NAPI support +#if SCRIPT_ENGINE_TYPE != SCRIPT_ENGINE_NAPI + if constexpr (std::is_same_v && isJson) { + auto u16str = std::make_shared(); + if (!cc::StringUtils::UTF8ToUTF16(*content, *u16str)) { + CC_LOG_ERROR("UTF8ToUTF16 failed, file: %s", fullPath.c_str()); + return false; + } + outValue = u16str; + } else { + outValue = content; + } +#endif + return true; +} + +template +static void js_readFile_invokeCallback(bool doJobSucceed, const typename ReadFileDoJobReturnType::value &content, const std::shared_ptr &callbackPtr) { + se::AutoHandleScope hs; + se::ValueArray seArgs; + seArgs.reserve(2); + + if (!doJobSucceed) { + seArgs.emplace_back(se::Value("readFile failed!")); + seArgs.emplace_back(se::Value::Null); + callbackPtr->toObject()->call(seArgs, nullptr); + return; + } + + static_assert(std::is_same_v || std::is_same_v, "No supported type!"); + + if constexpr (std::is_same_v) { + if constexpr (isJson) { +#if SCRIPT_ENGINE_TYPE == SCRIPT_ENGINE_NAPI + se::HandleObject jsonObj(se::Object::createJSONObject(*content)); +#else + se::HandleObject jsonObj(se::Object::createJSONObject(std::move(*content))); +#endif + if (!jsonObj.get()) { + seArgs.emplace_back(se::Value("Parse json failed!")); + seArgs.emplace_back(se::Value::Null); + } else { + seArgs.emplace_back(se::Value::Null); + seArgs.emplace_back(se::Value(jsonObj)); + } + callbackPtr->toObject()->call(seArgs, nullptr); + } else { + seArgs.emplace_back(se::Value::Null); + seArgs.emplace_back(se::Value(*content)); + callbackPtr->toObject()->call(seArgs, nullptr); + } + } else if constexpr (std::is_same_v) { + se::HandleObject dataObj(se::Object::createArrayBufferObject(content->getBytes(), content->getSize())); + seArgs.emplace_back(se::Value::Null); + seArgs.emplace_back(se::Value(dataObj)); + callbackPtr->toObject()->call(seArgs, nullptr); + } +} + +#define JSB_READ_FILE(funcName, type, isJson) \ + static bool funcName(se::State &s) { \ + ccstd::string fullPath; \ + std::shared_ptr callbackPtr; \ + bool ok = js_readFile_getParameters(s, fullPath, callbackPtr); \ + if (!ok) return false; \ + \ + gIOThreadPool->pushTask([fullPath, callbackPtr](int /* tid */) { \ + ReadFileDoJobReturnType::value content; \ + bool doJobSucceed = js_readFile_doJob(fullPath, content); \ + auto app = CC_CURRENT_APPLICATION(); \ + if (!app) { \ + return; \ + } \ + auto engine = app->getEngine(); \ + if (!engine) { \ + return; \ + } \ + engine->getScheduler()->performFunctionInCocosThread([doJobSucceed, content, callbackPtr]() { \ + js_readFile_invokeCallback(doJobSucceed, content, callbackPtr); \ + }); \ + }); \ + \ + return true; \ + } \ + SE_BIND_FUNC(funcName) + +JSB_READ_FILE(js_readTextFile, ccstd::string, false) +JSB_READ_FILE(js_readJsonFile, ccstd::string, true) +JSB_READ_FILE(js_readDataFile, cc::Data, false) static bool register_filetuils_ext(se::Object * /*obj*/) { // NOLINT(readability-identifier-naming) __jsb_cc_FileUtils_proto->defineFunction("listFilesRecursively", _SE(js_engine_FileUtils_listFilesRecursively)); __jsb_cc_FileUtils_proto->defineFunction("readTextFile", _SE(js_readTextFile)); __jsb_cc_FileUtils_proto->defineFunction("readDataFile", _SE(js_readDataFile)); __jsb_cc_FileUtils_proto->defineFunction("readJsonFile", _SE(js_readJsonFile)); - + return true; }