Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix script error logging #519

Merged
merged 1 commit into from
Jul 16, 2023
Merged

Fix script error logging #519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 22 additions & 7 deletions libraries/script-engine/src/v8/ScriptEngineV8.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,9 +634,13 @@ ScriptValue ScriptEngineV8::evaluateInClosure(const ScriptValue& _closure,
v8::Local<v8::Value> v8Result;
if (!maybeResult.ToLocal(&v8Result)) {
v8::String::Utf8Value utf8Value(getIsolate(), tryCatch.Exception());
QString errorMessage = QString(*utf8Value);
qCWarning(scriptengine_v8) << __FUNCTION__ << "---------- hasCaught:" << errorMessage;
qCWarning(scriptengine_v8) << __FUNCTION__ << "---------- tryCatch details:" << formatErrorMessageFromTryCatch(tryCatch);
QString errorMessage = QString(__FUNCTION__) + " hasCaught:" + QString(*utf8Value) + "\n"
+ "tryCatch details:" + formatErrorMessageFromTryCatch(tryCatch);
if (_manager) {
_manager->scriptErrorMessage(errorMessage);
} else {
qWarning(scriptengine_v8) << errorMessage;
}
}

if (hasUncaughtException()) {
Expand Down Expand Up @@ -685,6 +689,12 @@ ScriptValue ScriptEngineV8::evaluate(const QString& sourceCode, const QString& f
{
v8::TryCatch tryCatch(getIsolate());
if (!v8::Script::Compile(getContext(), v8::String::NewFromUtf8(getIsolate(), sourceCode.toStdString().c_str()).ToLocalChecked(), &scriptOrigin).ToLocal(&script)) {
QString errorMessage(QString("Error while compiling script: \"") + fileName + QString("\" ") + formatErrorMessageFromTryCatch(tryCatch));
if (_manager) {
_manager->scriptErrorMessage(errorMessage);
} else {
qDebug(scriptengine_v8) << errorMessage;
}
setUncaughtException(tryCatch, "Error while compiling script");
_evaluatingCounter--;
return nullValue();
Expand All @@ -697,7 +707,12 @@ ScriptValue ScriptEngineV8::evaluate(const QString& sourceCode, const QString& f
Q_ASSERT(tryCatchRun.HasCaught());
auto runError = tryCatchRun.Message();
ScriptValue errorValue(new ScriptValueV8Wrapper(this, V8ScriptValue(this, runError->Get())));
qCDebug(scriptengine_v8) << "Running script: \"" << fileName << "\" " << formatErrorMessageFromTryCatch(tryCatchRun);
QString errorMessage(QString("Running script: \"") + fileName + QString("\" ") + formatErrorMessageFromTryCatch(tryCatchRun));
if (_manager) {
_manager->scriptErrorMessage(errorMessage);
} else {
qDebug(scriptengine_v8) << errorMessage;
}
setUncaughtException(tryCatchRun, "script evaluation");

_evaluatingCounter--;
Expand Down Expand Up @@ -749,7 +764,7 @@ void ScriptEngineV8::setUncaughtException(const v8::TryCatch &tryCatch, const QS
if (backtraceV8String->IsString()) {
if (v8::Local<v8::String>::Cast(backtraceV8String)->Length() > 0) {
v8::String::Utf8Value backtraceUtf8Value(getIsolate(), backtraceV8String);
QString errorBacktrace = *backtraceUtf8Value;
QString errorBacktrace = QString(*backtraceUtf8Value).replace("\\n","\n");
ex->backtrace = errorBacktrace.split("\n");

}
Expand Down Expand Up @@ -790,14 +805,14 @@ QString ScriptEngineV8::formatErrorMessageFromTryCatch(v8::TryCatch &tryCatch) {
if (backtraceV8String->IsString()) {
if (v8::Local<v8::String>::Cast(backtraceV8String)->Length() > 0) {
v8::String::Utf8Value backtraceUtf8Value(getIsolate(), backtraceV8String);
errorBacktrace = *backtraceUtf8Value;
errorBacktrace = QString(*backtraceUtf8Value).replace("\\n","\n");
}
}
}
QTextStream resultStream(&result);
resultStream << "failed on line " << errorLineNumber << " column " << errorColumnNumber << " with message: \"" << errorMessage <<"\" backtrace: " << errorBacktrace;
}
return result;
return result.replace("\\n", "\n");
}

v8::Local<v8::ObjectTemplate> ScriptEngineV8::getObjectProxyTemplate() {
Expand Down
1 change: 1 addition & 0 deletions libraries/script-engine/src/v8/ScriptEngineV8.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,7 @@ class ScriptEngineV8 final : public ScriptEngine,
std::atomic<size_t> scriptValueCount{0};
std::atomic<size_t> scriptValueProxyCount{0};
#endif
friend ScriptValueV8Wrapper;
};

// This class is used to automatically add context to script engine's context list that is used by C++ calls
Expand Down
11 changes: 8 additions & 3 deletions libraries/script-engine/src/v8/ScriptObjectV8Proxy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1255,9 +1255,14 @@ int ScriptSignalV8Proxy::qt_metacall(QMetaObject::Call call, int id, void** argu
v8::TryCatch tryCatch(isolate);
callback->Call(functionContext, v8This, numArgs, args);
if (tryCatch.HasCaught()) {
qCDebug(scriptengine) << "Signal proxy " << fullName() << " connection call failed: \""
<< _engine->formatErrorMessageFromTryCatch(tryCatch)
<< "\nThis provided: " << conn.thisValue.get()->IsObject();
QString errorMessage(QString("Signal proxy ") + fullName() + " connection call failed: \""
+ _engine->formatErrorMessageFromTryCatch(tryCatch)
+ "\nThis provided: " + QString::number(conn.thisValue.get()->IsObject()));
if (_engine->_manager) {
_engine->_manager->scriptErrorMessage(errorMessage);
} else {
qDebug(scriptengine_v8) << errorMessage;
}

_engine->setUncaughtException(tryCatch, "Error in signal proxy");
}
Expand Down
2 changes: 1 addition & 1 deletion libraries/script-engine/src/v8/ScriptProgramV8Wrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ bool ScriptProgramV8Wrapper::compile() {
if (backtraceV8String->IsString()) {
if (v8::Local<v8::String>::Cast(backtraceV8String)->Length() > 0) {
v8::String::Utf8Value backtraceUtf8Value(isolate, backtraceV8String);
errorBacktrace = *backtraceUtf8Value;
errorBacktrace = QString(*backtraceUtf8Value).replace("\\n","\n");
}
}
}
Expand Down
15 changes: 12 additions & 3 deletions libraries/script-engine/src/v8/ScriptValueV8Wrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,15 +102,24 @@ ScriptValue ScriptValueV8Wrapper::call(const ScriptValue& thisObject, const Scri
auto maybeResult = v8Function->Call(_engine->getContext(), recv, args.length(), v8Args);
lock.unlock();
if (tryCatch.HasCaught()) {
qCDebug(scriptengine_v8) << "Function call failed: \"" << _engine->formatErrorMessageFromTryCatch(tryCatch);
QString errorMessage(QString("Function call failed: \"") + _engine->formatErrorMessageFromTryCatch(tryCatch));
if (_engine->_manager) {
_engine->_manager->scriptErrorMessage(errorMessage);
} else {
qDebug(scriptengine_v8) << errorMessage;
}
}
v8::Local<v8::Value> result;
Q_ASSERT(_engine == _value.getEngine());
if (maybeResult.ToLocal(&result)) {
return ScriptValue(new ScriptValueV8Wrapper(_engine, V8ScriptValue(_engine, result)));
} else {
//V8TODO Add more details
qCWarning(scriptengine_v8) << "JS function call failed";
QString errorMessage("JS function call failed: " + _engine->currentContext()->backtrace().join("\n"));
if (_engine->_manager) {
_engine->_manager->scriptErrorMessage(errorMessage);
} else {
qDebug(scriptengine_v8) << errorMessage;
}
return _engine->undefinedValue();
}
}
Expand Down
Loading