Skip to content

Restore Console inspector for V8 10.3 #1751

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

Merged
edusperoni merged 17 commits into from
Mar 17, 2023
Merged

Restore Console inspector for V8 10.3 #1751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
1b1a5b3
chore: Move NativeScript-specific inspector files out of V8 sources f…
ptomato Feb 24, 2023
4d0fb63
chore: Update V8 inspector headers
ptomato Feb 25, 2023
6da1a6b
fix: Remove use of DISALLOW_COPY_AND_ASSIGN macro in inspector
ptomato Feb 10, 2023
1f2b202
fix: Remove use of V8InspectorPlatform
ptomato Feb 24, 2023
221a9c2
fix: Compile as C++17
ptomato Feb 28, 2023
0bc0480
fix: Correctly initialize context in inspector client init()
ptomato Feb 28, 2023
7965aad
chore: Remove unused MessageHandler from inspector
ptomato Feb 28, 2023
9dc7770
chore: Refactor private members of JSV8InspectorClient
ptomato Feb 28, 2023
2509b7e
chore: Remove unused arguments from createInspectorSession
ptomato Feb 28, 2023
0907d7b
chore: Remove unused arguments from doDispatchMessage()
ptomato Feb 28, 2023
cf327ee
chore: Reorganize JsV8InspectorClient members
ptomato Feb 28, 2023
bf99049
chore: Update string conversion APIs in inspector
ptomato Feb 28, 2023
c8df6e3
chore: Use empty initializers for blank StringViews
ptomato Feb 28, 2023
6a52868
chore: Get inspector local context using Persistent.Get()
ptomato Feb 28, 2023
f357ce6
fix: Re-enable inspector code
ptomato Feb 28, 2023
2c4337b
fix: Implement console.log inspector with Runtime protocol
ptomato Mar 7, 2023
b9af8ab
Merge branch 'feature/v8-10.3.22-perf' of github.com:NativeScript/and…
edusperoni Mar 17, 2023
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
70 changes: 35 additions & 35 deletions test-app/app/src/main/java/com/tns/RuntimeHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,41 +163,41 @@ public static Runtime initRuntime(Context context) {

runtime = Runtime.initializeRuntimeWithConfiguration(config);
if (isDebuggable) {
// try {
// v8Inspector = new AndroidJsV8Inspector(context.getFilesDir().getAbsolutePath(), context.getPackageName());
// v8Inspector.start();
//
// // the following snippet is used as means to notify the VSCode extension
// // debugger that the debugger agent has started
// File debuggerStartedFile = new File("/data/local/tmp", context.getPackageName() + "-debugger-started");
// if (debuggerStartedFile.exists() && !debuggerStartedFile.isDirectory() && debuggerStartedFile.length() == 0) {
// java.io.FileWriter fileWriter = new java.io.FileWriter(debuggerStartedFile);
// fileWriter.write("started");
// fileWriter.close();
// }
//
// // check if --debug-brk flag has been set. If positive:
// // write to the file to invalidate the flag
// // inform the v8Inspector to pause the main thread
// File debugBreakFile = new File("/data/local/tmp", context.getPackageName() + "-debugbreak");
// boolean shouldBreak = false;
// if (debugBreakFile.exists() && !debugBreakFile.isDirectory() && debugBreakFile.length() == 0) {
// java.io.FileWriter fileWriter = new java.io.FileWriter(debugBreakFile);
// fileWriter.write("started");
// fileWriter.close();
//
// shouldBreak = true;
// }
//
// v8Inspector.waitForDebugger(shouldBreak);
// } catch (IOException e) {
// if (Util.isDebuggableApp(context)) {
// e.printStackTrace();
// }
// }
//
// // if app is in debuggable mode run livesync service
// // runtime needs to be initialized before the NativeScriptSyncService is enabled because it uses runtime.runScript(...)
try {
v8Inspector = new AndroidJsV8Inspector(context.getFilesDir().getAbsolutePath(), context.getPackageName());
v8Inspector.start();

// the following snippet is used as means to notify the VSCode extension
// debugger that the debugger agent has started
File debuggerStartedFile = new File("/data/local/tmp", context.getPackageName() + "-debugger-started");
if (debuggerStartedFile.exists() && !debuggerStartedFile.isDirectory() && debuggerStartedFile.length() == 0) {
java.io.FileWriter fileWriter = new java.io.FileWriter(debuggerStartedFile);
fileWriter.write("started");
fileWriter.close();
}

// check if --debug-brk flag has been set. If positive:
// write to the file to invalidate the flag
// inform the v8Inspector to pause the main thread
File debugBreakFile = new File("/data/local/tmp", context.getPackageName() + "-debugbreak");
boolean shouldBreak = false;
if (debugBreakFile.exists() && !debugBreakFile.isDirectory() && debugBreakFile.length() == 0) {
java.io.FileWriter fileWriter = new java.io.FileWriter(debugBreakFile);
fileWriter.write("started");
fileWriter.close();

shouldBreak = true;
}

v8Inspector.waitForDebugger(shouldBreak);
} catch (IOException e) {
if (Util.isDebuggableApp(context)) {
e.printStackTrace();
}
}

// if app is in debuggable mode run livesync service
// runtime needs to be initialized before the NativeScriptSyncService is enabled because it uses runtime.runScript(...)
initLiveSync(runtime, logger, context);

waitForLiveSync(context);
Expand Down
17 changes: 16 additions & 1 deletion test-app/runtime/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ endif (CCACHE_FOUND AND (USE_CCACHE))
# "-DANDROID_STL=c++_static" is just not enough for clang++ to find some libraries in the ndk
MESSAGE(STATUS "## ANDROID_NDK_ROOT: " ${ANDROID_NDK_ROOT})

set(COMMON_CMAKE_ARGUMENTS "-std=c++14 -Werror -Wno-unused-result -mstackrealign -fexceptions -fno-builtin-stpcpy -fno-rtti -DV8_31BIT_SMIS_ON_64BIT_ARCH -DV8_31BIT_SMIS_ON_64BIT_ARCH -DV8_ENABLE_REGEXP_INTERPRETER_THREADED_DISPATCH -DV8_EMBEDDED_BUILTINS")
set(COMMON_CMAKE_ARGUMENTS "-std=c++17 -Werror -Wno-unused-result -mstackrealign -fexceptions -fno-builtin-stpcpy -fno-rtti -DV8_31BIT_SMIS_ON_64BIT_ARCH -DV8_31BIT_SMIS_ON_64BIT_ARCH -DV8_ENABLE_REGEXP_INTERPRETER_THREADED_DISPATCH -DV8_EMBEDDED_BUILTINS")

if("${ANDROID_ABI}" MATCHES "arm64-v8a$" OR "${ANDROID_ABI}" MATCHES "x86_64$")
# Enable pointer compression on 64 bit platforms
Expand Down Expand Up @@ -63,6 +63,21 @@ else ()
# set(CMAKE_CXX_FLAGS "${COMMON_CMAKE_ARGUMENTS} -O3 -fvisibility=hidden -ffunction-sections -fno-data-sections")
endif ()

if (NOT OPTIMIZED_BUILD OR OPTIMIZED_WITH_INSPECTOR_BUILD)
# Debug builds will include the V8 inspector sources
add_definitions(-DAPPLICATION_IN_DEBUG)

set(
INSPECTOR_SOURCES

src/main/cpp/com_tns_AndroidJsV8Inspector.cpp
src/main/cpp/JsV8InspectorClient.cpp
)
else ()
# When building in Release mode we do not include the V8 inspector sources
set(INSPECTOR_SOURCES)
endif ()

# Command info: https://cmake.org/cmake/help/v3.4/command/add_library.html
# Creates(shared static) and names a library given relative sources
# Gradle automatically packages shared libraries with your APK.
Expand Down
67 changes: 33 additions & 34 deletions ...ector/src/inspector/v8-css-agent-impl.cpp → ...app/runtime/src/main/cpp/CSSAgentImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,30 @@

#include <NativeScriptAssert.h>
#include <v8_inspector/third_party/inspector_protocol/crdtp/json.h>
#include <v8_inspector/src/inspector/utils/v8-inspector-common.h>
#include <ArgConverter.h>
#include "v8-css-agent-impl.h"

namespace v8_inspector {
#include "CSSAgentImpl.h"
#include "utils/InspectorCommon.h"

using tns::ArgConverter;
namespace tns {

namespace CSSAgentState {
static const char cssEnabled[] = "cssEnabled";
}

V8CSSAgentImpl::V8CSSAgentImpl(V8InspectorSessionImpl* session,
protocol::FrontendChannel* frontendChannel,
protocol::DictionaryValue* state)
CSSAgentImpl::CSSAgentImpl(V8InspectorSessionImpl* session,
protocol::FrontendChannel* frontendChannel,
protocol::DictionaryValue* state)
: m_session(session),
m_frontend(frontendChannel),
m_state(state),
m_enabled(false) {
Instance = this;
}

V8CSSAgentImpl::~V8CSSAgentImpl() { }
CSSAgentImpl::~CSSAgentImpl() { }

void V8CSSAgentImpl::enable(std::unique_ptr<EnableCallback> callback) {
void CSSAgentImpl::enable(std::unique_ptr<EnableCallback> callback) {
if (m_enabled) {
callback->sendSuccess();
return;
Expand All @@ -40,7 +39,7 @@ void V8CSSAgentImpl::enable(std::unique_ptr<EnableCallback> callback) {
callback->sendSuccess();
}

DispatchResponse V8CSSAgentImpl::disable() {
DispatchResponse CSSAgentImpl::disable() {
if (!m_enabled) {
return DispatchResponse::Success();
}
Expand All @@ -53,7 +52,7 @@ DispatchResponse V8CSSAgentImpl::disable() {
}

// Not supported
DispatchResponse V8CSSAgentImpl::getMatchedStylesForNode(int in_nodeId, Maybe<protocol::CSS::CSSStyle>* out_inlineStyle, Maybe<protocol::CSS::CSSStyle>* out_attributesStyle, Maybe<protocol::Array<protocol::CSS::RuleMatch>>* out_matchedCSSRules, Maybe<protocol::Array<protocol::CSS::PseudoElementMatches>>* out_pseudoElements, Maybe<protocol::Array<protocol::CSS::InheritedStyleEntry>>* out_inherited, Maybe<protocol::Array<protocol::CSS::CSSKeyframesRule>>* out_cssKeyframesRules) {
DispatchResponse CSSAgentImpl::getMatchedStylesForNode(int in_nodeId, Maybe<protocol::CSS::CSSStyle>* out_inlineStyle, Maybe<protocol::CSS::CSSStyle>* out_attributesStyle, Maybe<protocol::Array<protocol::CSS::RuleMatch>>* out_matchedCSSRules, Maybe<protocol::Array<protocol::CSS::PseudoElementMatches>>* out_pseudoElements, Maybe<protocol::Array<protocol::CSS::InheritedStyleEntry>>* out_inherited, Maybe<protocol::Array<protocol::CSS::CSSKeyframesRule>>* out_cssKeyframesRules) {
//// out_inlineStyle
// auto cssPropsArr = protocol::Array<protocol::CSS::CSSProperty>::create();
// auto shorthandPropArr = protocol::Array<protocol::CSS::ShorthandEntry>::create();
Expand Down Expand Up @@ -114,7 +113,7 @@ DispatchResponse V8CSSAgentImpl::getMatchedStylesForNode(int in_nodeId, Maybe<pr
return DispatchResponse::Success();
}

DispatchResponse V8CSSAgentImpl::getInlineStylesForNode(int in_nodeId, Maybe<protocol::CSS::CSSStyle>* out_inlineStyle, Maybe<protocol::CSS::CSSStyle>* out_attributesStyle) {
DispatchResponse CSSAgentImpl::getInlineStylesForNode(int in_nodeId, Maybe<protocol::CSS::CSSStyle>* out_inlineStyle, Maybe<protocol::CSS::CSSStyle>* out_attributesStyle) {
//// out_inlineStyle
// auto cssPropsArr = protocol::Array<protocol::CSS::CSSProperty>::create();
// auto shorthandPropArr = protocol::Array<protocol::CSS::ShorthandEntry>::create();
Expand All @@ -137,7 +136,7 @@ DispatchResponse V8CSSAgentImpl::getInlineStylesForNode(int in_nodeId, Maybe<pro
return DispatchResponse::Success();
}

DispatchResponse V8CSSAgentImpl::getComputedStyleForNode(int in_nodeId, std::unique_ptr<protocol::Array<protocol::CSS::CSSComputedStyleProperty>>* out_computedStyle) {
DispatchResponse CSSAgentImpl::getComputedStyleForNode(int in_nodeId, std::unique_ptr<protocol::Array<protocol::CSS::CSSComputedStyleProperty>>* out_computedStyle) {
auto computedStylePropertyArr = std::make_unique<protocol::Array<protocol::CSS::CSSComputedStyleProperty>>();

std::string getComputedStylesForNodeString = "getComputedStylesForNode";
Expand Down Expand Up @@ -169,7 +168,7 @@ DispatchResponse V8CSSAgentImpl::getComputedStyleForNode(int in_nodeId, std::uni

if (maybeResult.ToLocal(&outResult)) {
auto resultString = outResult->ToString(context).ToLocalChecked();
String16 resultProtocolString = toProtocolString(isolate, resultString);
v8_inspector::String16 resultProtocolString = v8_inspector::toProtocolString(isolate, resultString);
std::vector<uint8_t> cbor;
v8_crdtp::json::ConvertJSONToCBOR(v8_crdtp::span<uint16_t>(resultProtocolString.characters16(), resultProtocolString.length()), &cbor);
std::unique_ptr<protocol::Value> resultJson = protocol::Value::parseBinary(cbor.data(), cbor.size());
Expand All @@ -178,7 +177,7 @@ DispatchResponse V8CSSAgentImpl::getComputedStyleForNode(int in_nodeId, std::uni

std::vector<uint8_t> json;
v8_crdtp::json::ConvertCBORToJSON(errorSupport.Errors(), &json);
auto errorSupportString = String16(reinterpret_cast<const char*>(json.data()), json.size()).utf8();
auto errorSupportString = v8_inspector::String16(reinterpret_cast<const char*>(json.data()), json.size()).utf8();
if (!errorSupportString.empty()) {
auto errorMessage = "Error while parsing CSSComputedStyleProperty object. ";
DEBUG_WRITE_FORCE("%s Error: %s", errorMessage, errorSupportString.c_str());
Expand All @@ -197,7 +196,7 @@ DispatchResponse V8CSSAgentImpl::getComputedStyleForNode(int in_nodeId, std::uni
return DispatchResponse::Success();
}

DispatchResponse V8CSSAgentImpl::getPlatformFontsForNode(int in_nodeId, std::unique_ptr<protocol::Array<protocol::CSS::PlatformFontUsage>>* out_fonts) {
DispatchResponse CSSAgentImpl::getPlatformFontsForNode(int in_nodeId, std::unique_ptr<protocol::Array<protocol::CSS::PlatformFontUsage>>* out_fonts) {
auto fontsArr = std::make_unique<protocol::Array<protocol::CSS::PlatformFontUsage>>();
auto defaultFont = "System Font";
fontsArr->emplace_back(std::move(protocol::CSS::PlatformFontUsage::create()
Expand All @@ -210,71 +209,71 @@ DispatchResponse V8CSSAgentImpl::getPlatformFontsForNode(int in_nodeId, std::uni
return DispatchResponse::Success();
}

DispatchResponse V8CSSAgentImpl::getStyleSheetText(const String& in_styleSheetId, String* out_text) {
DispatchResponse CSSAgentImpl::getStyleSheetText(const String& in_styleSheetId, String* out_text) {
*out_text = "";

return utils::Common::protocolCommandNotSupportedDispatchResponse();
}

DispatchResponse V8CSSAgentImpl::addRule(const String& in_styleSheetId, const String& in_ruleText, std::unique_ptr<protocol::CSS::SourceRange> in_location, std::unique_ptr<protocol::CSS::CSSRule>* out_rule) {
DispatchResponse CSSAgentImpl::addRule(const String& in_styleSheetId, const String& in_ruleText, std::unique_ptr<protocol::CSS::SourceRange> in_location, std::unique_ptr<protocol::CSS::CSSRule>* out_rule) {
return utils::Common::protocolCommandNotSupportedDispatchResponse();
}

DispatchResponse V8CSSAgentImpl::collectClassNames(const String& in_styleSheetId, std::unique_ptr<protocol::Array<String>>* out_classNames) {
DispatchResponse CSSAgentImpl::collectClassNames(const String& in_styleSheetId, std::unique_ptr<protocol::Array<String>>* out_classNames) {
return utils::Common::protocolCommandNotSupportedDispatchResponse();
}

DispatchResponse V8CSSAgentImpl::createStyleSheet(const String& in_frameId, String* out_styleSheetId) {
DispatchResponse CSSAgentImpl::createStyleSheet(const String& in_frameId, String* out_styleSheetId) {
return utils::Common::protocolCommandNotSupportedDispatchResponse();
}

DispatchResponse V8CSSAgentImpl::forcePseudoState(int in_nodeId, std::unique_ptr<protocol::Array<String>> in_forcedPseudoClasses) {
DispatchResponse CSSAgentImpl::forcePseudoState(int in_nodeId, std::unique_ptr<protocol::Array<String>> in_forcedPseudoClasses) {
return utils::Common::protocolCommandNotSupportedDispatchResponse();
}

DispatchResponse V8CSSAgentImpl::getBackgroundColors(int in_nodeId, Maybe<protocol::Array<String>>* out_backgroundColors, Maybe<String>* out_computedFontSize, Maybe<String>* out_computedFontWeight) {
DispatchResponse CSSAgentImpl::getBackgroundColors(int in_nodeId, Maybe<protocol::Array<String>>* out_backgroundColors, Maybe<String>* out_computedFontSize, Maybe<String>* out_computedFontWeight) {
return utils::Common::protocolCommandNotSupportedDispatchResponse();
}

DispatchResponse V8CSSAgentImpl::getMediaQueries(std::unique_ptr<protocol::Array<protocol::CSS::CSSMedia>>* out_medias) {
DispatchResponse CSSAgentImpl::getMediaQueries(std::unique_ptr<protocol::Array<protocol::CSS::CSSMedia>>* out_medias) {
return utils::Common::protocolCommandNotSupportedDispatchResponse();
}

DispatchResponse V8CSSAgentImpl::setEffectivePropertyValueForNode(int in_nodeId, const String& in_propertyName, const String& in_value) {
DispatchResponse CSSAgentImpl::setEffectivePropertyValueForNode(int in_nodeId, const String& in_propertyName, const String& in_value) {
return utils::Common::protocolCommandNotSupportedDispatchResponse();
}

DispatchResponse V8CSSAgentImpl::setKeyframeKey(const String& in_styleSheetId, std::unique_ptr<protocol::CSS::SourceRange> in_range, const String& in_keyText, std::unique_ptr<protocol::CSS::Value>* out_keyText) {
DispatchResponse CSSAgentImpl::setKeyframeKey(const String& in_styleSheetId, std::unique_ptr<protocol::CSS::SourceRange> in_range, const String& in_keyText, std::unique_ptr<protocol::CSS::Value>* out_keyText) {
return utils::Common::protocolCommandNotSupportedDispatchResponse();
}

DispatchResponse V8CSSAgentImpl::setMediaText(const String& in_styleSheetId, std::unique_ptr<protocol::CSS::SourceRange> in_range, const String& in_text, std::unique_ptr<protocol::CSS::CSSMedia>* out_media) {
DispatchResponse CSSAgentImpl::setMediaText(const String& in_styleSheetId, std::unique_ptr<protocol::CSS::SourceRange> in_range, const String& in_text, std::unique_ptr<protocol::CSS::CSSMedia>* out_media) {
return utils::Common::protocolCommandNotSupportedDispatchResponse();
}

DispatchResponse V8CSSAgentImpl::setRuleSelector(const String& in_styleSheetId, std::unique_ptr<protocol::CSS::SourceRange> in_range, const String& in_selector, std::unique_ptr<protocol::CSS::SelectorList>* out_selectorList) {
DispatchResponse CSSAgentImpl::setRuleSelector(const String& in_styleSheetId, std::unique_ptr<protocol::CSS::SourceRange> in_range, const String& in_selector, std::unique_ptr<protocol::CSS::SelectorList>* out_selectorList) {
return utils::Common::protocolCommandNotSupportedDispatchResponse();
}

DispatchResponse V8CSSAgentImpl::setStyleSheetText(const String& in_styleSheetId, const String& in_text, Maybe<String>* out_sourceMapURL) {
DispatchResponse CSSAgentImpl::setStyleSheetText(const String& in_styleSheetId, const String& in_text, Maybe<String>* out_sourceMapURL) {
return utils::Common::protocolCommandNotSupportedDispatchResponse();
}

DispatchResponse V8CSSAgentImpl::setStyleTexts(std::unique_ptr<protocol::Array<protocol::CSS::StyleDeclarationEdit>> in_edits, std::unique_ptr<protocol::Array<protocol::CSS::CSSStyle>>* out_styles) {
DispatchResponse CSSAgentImpl::setStyleTexts(std::unique_ptr<protocol::Array<protocol::CSS::StyleDeclarationEdit>> in_edits, std::unique_ptr<protocol::Array<protocol::CSS::CSSStyle>>* out_styles) {
return utils::Common::protocolCommandNotSupportedDispatchResponse();
}

DispatchResponse V8CSSAgentImpl::startRuleUsageTracking() {
DispatchResponse CSSAgentImpl::startRuleUsageTracking() {
return utils::Common::protocolCommandNotSupportedDispatchResponse();
}

DispatchResponse V8CSSAgentImpl::stopRuleUsageTracking(std::unique_ptr<protocol::Array<protocol::CSS::RuleUsage>>* out_ruleUsage) {
DispatchResponse CSSAgentImpl::stopRuleUsageTracking(std::unique_ptr<protocol::Array<protocol::CSS::RuleUsage>>* out_ruleUsage) {
return utils::Common::protocolCommandNotSupportedDispatchResponse();
}

DispatchResponse V8CSSAgentImpl::takeCoverageDelta(std::unique_ptr<protocol::Array<protocol::CSS::RuleUsage>>* out_coverage) {
DispatchResponse CSSAgentImpl::takeCoverageDelta(std::unique_ptr<protocol::Array<protocol::CSS::RuleUsage>>* out_coverage) {
return utils::Common::protocolCommandNotSupportedDispatchResponse();
}

V8CSSAgentImpl* V8CSSAgentImpl::Instance = 0;
}
CSSAgentImpl* CSSAgentImpl::Instance = 0;
} // namespace tns
Loading