feat: Upgrade V8 to 8.3.110.9

Author: darind

.travis.yml

@@ -1,7 +1,7 @@
 env:
   global:
   - NODE_VERSION=10
-  - NDK_VERSION=r21
+  - NDK_VERSION=r21b
   - DATE=$(date +%Y-%m-%d)
   - PACKAGE_VERSION=next-$DATE-$TRAVIS_BUILD_NUMBER
   - EMULATOR_API_LEVEL=21

build-artifacts/project-template-gradle/settings.json

@@ -1,5 +1,5 @@
 {
-    "v8Version": "8.0.426.16",
-    "ndkRevision": "21.0.6113669",
+    "v8Version": "8.3.110.9",
+    "ndkRevision": "21.1.6352462",
     "mksnapshotParams": "--profile_deserialization --turbo_instruction_scheduling --target_os=android --no-native-code-counters"
 }

package.json

@@ -13,5 +13,5 @@
     "version": "5.4.1",
     "android": "3.5.3"
   },
-  "android_ndk_version": "21"
+  "android_ndk_version": "21b"
 }

test-app/runtime/CMakeLists.txt

@@ -118,7 +118,6 @@ if (NOT OPTIMIZED_BUILD OR OPTIMIZED_WITH_INSPECTOR_BUILD)
         src/main/cpp/v8_inspector/src/inspector/v8-string-conversions.cc
         src/main/cpp/v8_inspector/src/inspector/v8-value-utils.cc
         src/main/cpp/v8_inspector/src/inspector/value-mirror.cc
-        src/main/cpp/v8_inspector/src/inspector/wasm-translation.cc
     )
 else ()
     # Debug builds will include the V8 inspector sources

test-app/runtime/src/main/cpp/DOMDomainCallbackHandlers.cpp

@@ -5,6 +5,7 @@
 #include <sstream>
 #include <ArgConverter.h>
 #include <NativeScriptAssert.h>
+#include <v8_inspector/third_party/inspector_protocol/crdtp/json.h>
 #include "DOMDomainCallbackHandlers.h"
 
 using namespace tns;
@@ -41,14 +42,18 @@ void DOMDomainCallbackHandlers::ChildNodeInsertedCallback(const v8::FunctionCall
         auto node = args[2]->ToString(context).ToLocalChecked();
 
         auto resultString = V8DOMAgentImpl::AddBackendNodeIdProperty(isolate, node);
-        auto resultUtf16Data = resultString.data();
-
-        auto nodeJson = protocol::StringUtil::parseJSON(String16((const uint16_t*) resultUtf16Data));
+        auto nodeUtf16Data = resultString.data();
+        const String16& nodeString16 = String16((const uint16_t*) nodeUtf16Data);
+        std::vector<uint8_t> cbor;
+        v8_crdtp::json::ConvertJSONToCBOR(v8_crdtp::span<uint16_t>(nodeString16.characters16(), nodeString16.length()), &cbor);
+        std::unique_ptr<protocol::Value> protocolNodeJson = protocol::Value::parseBinary(cbor.data(), cbor.size());
 
         protocol::ErrorSupport errorSupport;
-        auto domNode = protocol::DOM::Node::fromValue(nodeJson.get(), &errorSupport);
+        auto domNode = protocol::DOM::Node::fromValue(protocolNodeJson.get(), &errorSupport);
 
-        auto errorSupportString = errorSupport.errors().utf8();
+        std::vector<uint8_t> json;
+        v8_crdtp::json::ConvertCBORToJSON(errorSupport.Errors(), &json);
+        auto errorSupportString = String16(reinterpret_cast<const char*>(json.data()), json.size()).utf8();
         if (!errorSupportString.empty()) {
             auto errorMessage = "Error while parsing debug `DOM Node` object. ";
             DEBUG_WRITE_FORCE("%s Error: %s", errorMessage, errorSupportString.c_str());

test-app/runtime/src/main/cpp/MetadataNode.cpp

@@ -351,7 +351,8 @@ void MetadataNode::FieldAccessorSetterCallback(Local<Name> property, Local<Value
         auto fieldCallbackData = reinterpret_cast<FieldCallbackData*>(info.Data().As<External>()->Value());
 
         if (!fieldCallbackData->isStatic && thiz->StrictEquals(info.Holder())) {
-            info.GetReturnValue().SetUndefined();
+            auto isolate = info.GetIsolate();
+            info.GetReturnValue().Set(v8::Undefined(isolate));
             return;
         }
 

test-app/runtime/src/main/cpp/NSV8DebuggerAgentImpl.cpp

@@ -31,7 +31,7 @@ Response NSV8DebuggerAgentImpl::getPossibleBreakpoints(
         return V8DebuggerAgentImpl::getPossibleBreakpoints(std::move(start), std::move(end), std::move(restrictToFunction), locations);
     } else {
         *locations = std::make_unique<protocol::Array<protocol::Debugger::BreakLocation>>();
-        return Response::OK();
+        return Response::Success();
     }
 }
 

test-app/runtime/src/main/cpp/NetworkDomainCallbackHandlers.cpp

@@ -3,6 +3,7 @@
 //
 
 #include <sstream>
+#include <v8_inspector/third_party/inspector_protocol/crdtp/json.h>
 #include "NetworkDomainCallbackHandlers.h"
 #include "NativeScriptAssert.h"
 
@@ -65,16 +66,17 @@ void NetworkDomainCallbackHandlers::ResponseReceivedCallback(const v8::FunctionC
             throw NativeScriptException("`response` parameter not in the correct format.");
         }
 
-        auto responseJsonString = ArgConverter::ConvertToUtf16String(responseJson);
-        auto responseUtf16Data = responseJsonString.data();
-        auto protocolResponseJson = protocol::StringUtil::parseJSON(String16((const uint16_t*) responseUtf16Data));
+        const String16 responseJsonString = toProtocolString(isolate, responseJson);
+        std::vector<uint8_t> cbor;
+        v8_crdtp::json::ConvertJSONToCBOR(v8_crdtp::span<uint16_t>(responseJsonString.characters16(), responseJsonString.length()), &cbor);
+        std::unique_ptr<protocol::Value> protocolResponseJson = protocol::Value::parseBinary(cbor.data(), cbor.size());
 
         protocol::ErrorSupport errorSupport;
+        auto protocolResponseObj = protocol::Network::Response::fromValue(protocolResponseJson.get(), &errorSupport);
 
-        auto protocolResponseObj = protocol::Network::Response::fromValue(protocolResponseJson.get(),
-                                   &errorSupport);
-
-        auto errorString = errorSupport.errors().utf8();
+        std::vector<uint8_t> json;
+        v8_crdtp::json::ConvertCBORToJSON(errorSupport.Errors(), &json);
+        auto errorString = String16(reinterpret_cast<const char*>(json.data()), json.size()).utf8();
 
         if (!errorString.empty()) {
             auto errorMessage = "Error while parsing debug `response` object. ";
@@ -166,16 +168,18 @@ void NetworkDomainCallbackHandlers::RequestWillBeSentCallback(const v8::Function
             throw NativeScriptException("`request` parameter not in the correct format.");
         }
 
-        auto requestJsonString = ArgConverter::ConvertToUtf16String(requestJson);
-        auto requestUtf16Data = requestJsonString.data();
-        auto protocolRequestJson = protocol::StringUtil::parseJSON(String16((const uint16_t*)  requestUtf16Data));
+        const String16& requestJsonString16 = toProtocolString(isolate, requestJson);
+        std::vector<uint8_t> cbor;
+        v8_crdtp::json::ConvertJSONToCBOR(v8_crdtp::span<uint16_t>(requestJsonString16.characters16(), requestJsonString16.length()), &cbor);
+        std::unique_ptr<protocol::Value> protocolRequestJson = protocol::Value::parseBinary(cbor.data(), cbor.size());
 
         protocol::ErrorSupport errorSupport;
-
         auto protocolRequestObj = protocol::Network::Request::fromValue(protocolRequestJson.get(), &errorSupport);
         auto initiator = protocol::Network::Initiator::create().setType(protocol::Network::Initiator::TypeEnum::Script).build();
 
-        auto errorString = errorSupport.errors().utf8();
+        std::vector<uint8_t> json;
+        v8_crdtp::json::ConvertCBORToJSON(errorSupport.Errors(), &json);
+        auto errorString = String16(reinterpret_cast<const char*>(json.data()), json.size()).utf8();
 
         if (!errorString.empty()) {
             auto errorMessage = "Error while parsing debug `request` object. ";

test-app/runtime/src/main/cpp/include/inspector/Debugger.h

@@ -16,8 +16,8 @@ namespace protocol {
 #define v8_inspector_protocol_exported_api_h
 class V8_EXPORT Exported {
 public:
-    virtual std::unique_ptr<StringBuffer> toJSONString() const = 0;
-    virtual void writeBinary(std::vector<uint8_t>* out) const = 0;
+    virtual void AppendSerialized(std::vector<uint8_t>* out) const = 0;
+
     virtual ~Exported() { }
 };
 #endif // !defined(v8_inspector_protocol_exported_api_h)
@@ -47,7 +47,6 @@ V8_EXPORT extern const char* XHR;
 
 class V8_EXPORT SearchMatch : public Exported {
 public:
-    static std::unique_ptr<protocol::Debugger::API::SearchMatch> fromJSONString(const StringView& json);
     static std::unique_ptr<protocol::Debugger::API::SearchMatch> fromBinary(const uint8_t* data, size_t length);
 };
 

test-app/runtime/src/main/cpp/include/inspector/Runtime.h

@@ -16,8 +16,8 @@ namespace protocol {
 #define v8_inspector_protocol_exported_api_h
 class V8_EXPORT Exported {
 public:
-    virtual std::unique_ptr<StringBuffer> toJSONString() const = 0;
-    virtual void writeBinary(std::vector<uint8_t>* out) const = 0;
+    virtual void AppendSerialized(std::vector<uint8_t>* out) const = 0;
+
     virtual ~Exported() { }
 };
 #endif // !defined(v8_inspector_protocol_exported_api_h)
@@ -31,19 +31,16 @@ namespace API {
 
 class V8_EXPORT RemoteObject : public Exported {
 public:
-    static std::unique_ptr<protocol::Runtime::API::RemoteObject> fromJSONString(const StringView& json);
     static std::unique_ptr<protocol::Runtime::API::RemoteObject> fromBinary(const uint8_t* data, size_t length);
 };
 
 class V8_EXPORT StackTrace : public Exported {
 public:
-    static std::unique_ptr<protocol::Runtime::API::StackTrace> fromJSONString(const StringView& json);
     static std::unique_ptr<protocol::Runtime::API::StackTrace> fromBinary(const uint8_t* data, size_t length);
 };
 
 class V8_EXPORT StackTraceId : public Exported {
 public:
-    static std::unique_ptr<protocol::Runtime::API::StackTraceId> fromJSONString(const StringView& json);
     static std::unique_ptr<protocol::Runtime::API::StackTraceId> fromBinary(const uint8_t* data, size_t length);
 };