GithubStar/Hippy
1
0
Fork 0
mirror of https://github.com/Tencent/Hippy.git synced 2026-10-28 21:48:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): fix uncaughtException bug

Browse Source
This commit is contained in:
pollyzhang
2023-04-04 00:05:55 +08:00
committed by zoomchan-cxj
parent 51bb33a485
commit 00a73380a6
3 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/sdk/src/main/jni/src/bridge/entry.cc
+13 -11
View File
@@ -75,11 +75,11 @@ constexpr char kCurDir[] = "__HIPPYCURDIR__";
std::vector<intptr_t> external_references{};
void HandleUncaughtJsError(v8::Local<v8::Message> message,
v8::Local<v8::Value> error) {
v8::Local<v8::Value> data) {
TDF_BASE_DLOG(INFO) << "HandleUncaughtJsError begin";
if (error.IsEmpty()) {
TDF_BASE_DLOG(ERROR) << "HandleUncaughtJsError error is empty";
if (message.IsEmpty()) {
TDF_BASE_DLOG(ERROR) << "HandleUncaughtJsError message is empty";
return;
}
@@ -97,17 +97,19 @@ void HandleUncaughtJsError(v8::Local<v8::Message> message,
if (!context) {
return;
}
std::shared_ptr<hippy::napi::V8Ctx> ctx = std::static_pointer_cast<hippy::napi::V8Ctx>(context);
auto ctx = std::static_pointer_cast<hippy::napi::V8Ctx>(context);
auto description = ctx->GetMsgDesc(message);
auto stack = ctx->GetStackInfo(message);
TDF_BASE_LOG(ERROR) << "HandleUncaughtJsError, runtime_id = "
<< runtime->GetId()
<< ", desc = "
<< ctx->GetMsgDesc(message)
<< ", stack = " << ctx->GetStackInfo(message);
ExceptionHandler::ReportJsException(runtime, ctx->GetMsgDesc(message),
ctx->GetStackInfo(message));
ctx->HandleUncaughtException(
std::make_shared<hippy::napi::V8CtxValue>(isolate, error));
<< description
<< ", stack = "
<< stack;
ExceptionHandler::ReportJsException(runtime, description, stack);
auto error = ctx->CreateError(message);
ctx->HandleUncaughtException(error);
TDF_BASE_DLOG(INFO) << "HandleUncaughtJsError end";
}
core/include/core/napi/v8/v8_ctx.h
+2 -1
View File
@@ -186,9 +186,10 @@ class V8Ctx : public Ctx {
std::string GetSerializationBuffer(const std::shared_ptr<CtxValue>& value, std::string& reused_buffer);
unicode_string_view ToStringView(v8::Local<v8::String> str) const;
unicode_string_view GetMsgDesc(v8::Local<v8::Message> message);
unicode_string_view GetMsgDesc(v8::Local<v8::Message> message) const;
unicode_string_view GetStackInfo(v8::Local<v8::Message> message) const;
unicode_string_view GetStackTrace(v8::Local<v8::StackTrace> trace) const;
std::shared_ptr<CtxValue> CreateError(v8::Local<v8::Message> message) const;
v8::Local<v8::String> CreateV8String(const unicode_string_view& string) const;
void SetAlignedPointerInEmbedderData(int index, intptr_t address);
core/src/napi/v8/v8_ctx.cc
+6 -1
View File
@@ -189,7 +189,7 @@ class ExternalStringResourceImpl : public v8::String::ExternalStringResource {
size_t length_;
};
unicode_string_view V8Ctx::GetMsgDesc(v8::Local<v8::Message> message) {
unicode_string_view V8Ctx::GetMsgDesc(v8::Local<v8::Message> message) const {
if (message.IsEmpty()) {
return "";
}
@@ -262,6 +262,11 @@ unicode_string_view V8Ctx::GetStackInfo(v8::Local<v8::Message> message) const {
return GetStackTrace(trace);
}
std::shared_ptr<CtxValue> V8Ctx::CreateError(v8::Local<v8::Message> message) const {
auto string = message->Get();
return std::make_shared<V8CtxValue>(isolate_, string);
}
void V8Ctx::SetExternalData(void* address) {
SetAlignedPointerInEmbedderData(kScopeWrapperIndex, reinterpret_cast<intptr_t>(address));
}