![electron-roller[bot]](/assets/img/avatar_default.png)
* chore: bump chromium in DEPS to 140.0.7269.2 * chore: bump chromium in DEPS to 140.0.7270.0 * chore: bump chromium in DEPS to 140.0.7271.0 * chore: bump chromium in DEPS to 140.0.7273.0 * 6516731: [ExclusiveAccessForAndroid] remove unneeded includes & deps | https://chromium-review.googlesource.com/c/chromium/src/+/6516731 * 6694809: dbus: Ensure systemd scope is started before using any portal services | https://chromium-review.googlesource.com/c/chromium/src/+/6694809 * chore: patch chromium * chore: export patches * chore: bump chromium in DEPS to 140.0.7275.0 * 6677511: [pepper] More pepper removal | https://chromium-review.googlesource.com/c/chromium/src/+/6677511 * 6513641: [gin] Rename gin::Wrappable to gin::DeprecatedWrappable | https://chromium-review.googlesource.com/c/chromium/src/+/6513641 * chore: export chromium patches * 6513641: [gin] Rename gin::Wrappable to gin::DeprecatedWrappable | https://chromium-review.googlesource.com/c/chromium/src/+/6513641 * chore: bump chromium in DEPS to 140.0.7277.0 * chore: bump chromium in DEPS to 140.0.7279.0 * chore: bump chromium in DEPS to 140.0.7281.0 * 6677314: Plumb enabled client hints in the network requestion to network layer https://chromium-review.googlesource.com/c/chromium/src/+/6677314 * 6351556: [source-phase-imports] Support Wasm Source Phase Imports https://chromium-review.googlesource.com/c/chromium/src/+/6351556 * 6700077: [renderer] Avoid calls to deprecated GetIsolate methods https://chromium-review.googlesource.com/c/chromium/src/+/6700077 * 6692873: Reland "Reland "FSA: Only normalize the hardcoded rules once during initialization"" https://chromium-review.googlesource.com/c/chromium/src/+/6692873 * 6686234: [gin] Cleanup NamedPropertyInterceptor for Wrappable https://chromium-review.googlesource.com/c/chromium/src/+/6686234 * chore: export patches * 6667723: Remove content_enable_legacy_ipc GN arg. https://chromium-review.googlesource.com/c/chromium/src/+/6667723 * 6646566: ui: Move NativeWindowTracker to its own directory https://chromium-review.googlesource.com/c/chromium/src/+/6646566 * fix: add missing includes * 6580522: [WAR, DNR] Fix unsafe redirect error to web accessible resource https://chromium-review.googlesource.com/c/chromium/src/+/6580522 * 6680477: Implement `completeCode` endpoint and expose to DevTools https://chromium-review.googlesource.com/c/chromium/src/+/6680477 * 6677511: [pepper] More pepper removal https://chromium-review.googlesource.com/c/chromium/src/+/6677511 * 6696689: Rename views::WidgetFocusManager -> NativeViewFocusManager https://chromium-review.googlesource.com/c/chromium/src/+/6696689 * 6702812: Move wtf/text/string_impl*.* to "blink" namespace https://chromium-review.googlesource.com/c/chromium/src/+/6702812 * chore: fix dialog patch * 6702431: [animation-trigger] Parse timeline-trigger-name https://chromium-review.googlesource.com/c/chromium/src/+/6702431 * chore: fixup patch indices * feat: replace webFrame.routingId with webFrame.frameToken * feat: WebFrameMain.prototype.frameToken * test: refactor to use replacement APIs * chore: fixup pip patch * test: adjust webFrame tests for frameToken changes * 6703757: Reland "Enable -fsanitize=array-bounds in non-UBSan builds" https://chromium-review.googlesource.com/c/chromium/src/+/6703757 * test: switch to frameTokens * test: routingId is fine to test in the main process * docs: add routingId to breaking changes * docs: update plugin-crashed event * chore: fixup linux dialog patch --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: alice <alice@makenotion.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Samuel Maddock <smaddock@slack-corp.com>
200 lines
6.3 KiB
C++
200 lines
6.3 KiB
C++
// Copyright (c) 2016 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/api/electron_api_debugger.h"
|
|
|
|
#include <string>
|
|
#include <string_view>
|
|
#include <utility>
|
|
|
|
#include "base/containers/span.h"
|
|
#include "base/json/json_reader.h"
|
|
#include "base/json/json_writer.h"
|
|
#include "content/public/browser/devtools_agent_host.h"
|
|
#include "content/public/browser/web_contents.h"
|
|
#include "gin/handle.h"
|
|
#include "gin/object_template_builder.h"
|
|
#include "gin/per_isolate_data.h"
|
|
#include "shell/browser/javascript_environment.h"
|
|
#include "shell/common/gin_converters/value_converter.h"
|
|
#include "shell/common/gin_helper/promise.h"
|
|
|
|
using content::DevToolsAgentHost;
|
|
|
|
namespace electron::api {
|
|
|
|
gin::DeprecatedWrapperInfo Debugger::kWrapperInfo = {gin::kEmbedderNativeGin};
|
|
|
|
Debugger::Debugger(v8::Isolate* isolate, content::WebContents* web_contents)
|
|
: content::WebContentsObserver(web_contents), web_contents_(web_contents) {}
|
|
|
|
Debugger::~Debugger() = default;
|
|
|
|
void Debugger::AgentHostClosed(DevToolsAgentHost* agent_host) {
|
|
DCHECK(agent_host == agent_host_);
|
|
agent_host_ = nullptr;
|
|
ClearPendingRequests();
|
|
Emit("detach", "target closed");
|
|
}
|
|
|
|
void Debugger::DispatchProtocolMessage(DevToolsAgentHost* agent_host,
|
|
base::span<const uint8_t> message) {
|
|
DCHECK(agent_host == agent_host_);
|
|
|
|
v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
|
|
v8::HandleScope handle_scope(isolate);
|
|
|
|
const std::string_view message_str = base::as_string_view(message);
|
|
std::optional<base::Value> parsed_message = base::JSONReader::Read(
|
|
message_str, base::JSON_REPLACE_INVALID_CHARACTERS);
|
|
if (!parsed_message || !parsed_message->is_dict())
|
|
return;
|
|
base::Value::Dict& dict = parsed_message->GetDict();
|
|
std::optional<int> id = dict.FindInt("id");
|
|
if (!id) {
|
|
std::string* method = dict.FindString("method");
|
|
if (!method)
|
|
return;
|
|
std::string* session_id = dict.FindString("sessionId");
|
|
base::Value::Dict* params = dict.FindDict("params");
|
|
Emit("message", *method, params ? std::move(*params) : base::Value::Dict(),
|
|
session_id ? *session_id : "");
|
|
} else {
|
|
auto it = pending_requests_.find(*id);
|
|
if (it == pending_requests_.end())
|
|
return;
|
|
|
|
gin_helper::Promise<base::Value::Dict> promise = std::move(it->second);
|
|
pending_requests_.erase(it);
|
|
|
|
base::Value::Dict* error = dict.FindDict("error");
|
|
if (error) {
|
|
std::string* error_message = error->FindString("message");
|
|
promise.RejectWithErrorMessage(error_message ? *error_message : "");
|
|
} else {
|
|
base::Value::Dict* result = dict.FindDict("result");
|
|
promise.Resolve(result ? std::move(*result) : base::Value::Dict());
|
|
}
|
|
}
|
|
}
|
|
|
|
void Debugger::RenderFrameHostChanged(content::RenderFrameHost* old_rfh,
|
|
content::RenderFrameHost* new_rfh) {
|
|
// ConnectWebContents uses the primary main frame of the webContents,
|
|
// so if the new_rfh is not the primary main frame, we don't want to
|
|
// reconnect otherwise we'll end up trying to reconnect to a RenderFrameHost
|
|
// that already has a DevToolsAgentHost associated with it.
|
|
if (agent_host_ && new_rfh->IsInPrimaryMainFrame()) {
|
|
agent_host_->DisconnectWebContents();
|
|
auto* web_contents = content::WebContents::FromRenderFrameHost(new_rfh);
|
|
agent_host_->ConnectWebContents(web_contents);
|
|
}
|
|
}
|
|
|
|
void Debugger::Attach(gin::Arguments* args) {
|
|
std::string protocol_version;
|
|
args->GetNext(&protocol_version);
|
|
|
|
if (agent_host_) {
|
|
args->ThrowTypeError("Debugger is already attached to the target");
|
|
return;
|
|
}
|
|
|
|
if (!protocol_version.empty() &&
|
|
!DevToolsAgentHost::IsSupportedProtocolVersion(protocol_version)) {
|
|
args->ThrowTypeError("Requested protocol version is not supported");
|
|
return;
|
|
}
|
|
|
|
agent_host_ = DevToolsAgentHost::GetOrCreateFor(web_contents_);
|
|
if (!agent_host_) {
|
|
args->ThrowTypeError("No target available");
|
|
return;
|
|
}
|
|
|
|
agent_host_->AttachClient(this);
|
|
}
|
|
|
|
bool Debugger::IsAttached() {
|
|
return agent_host_ && agent_host_->IsAttached();
|
|
}
|
|
|
|
void Debugger::Detach() {
|
|
if (!agent_host_)
|
|
return;
|
|
agent_host_->DetachClient(this);
|
|
AgentHostClosed(agent_host_.get());
|
|
}
|
|
|
|
v8::Local<v8::Promise> Debugger::SendCommand(gin::Arguments* args) {
|
|
v8::Isolate* isolate = args->isolate();
|
|
gin_helper::Promise<base::Value::Dict> promise(isolate);
|
|
v8::Local<v8::Promise> handle = promise.GetHandle();
|
|
|
|
if (!agent_host_) {
|
|
promise.RejectWithErrorMessage("No target available");
|
|
return handle;
|
|
}
|
|
|
|
std::string method;
|
|
if (!args->GetNext(&method)) {
|
|
promise.RejectWithErrorMessage("Invalid method");
|
|
return handle;
|
|
}
|
|
|
|
base::Value::Dict command_params;
|
|
args->GetNext(&command_params);
|
|
|
|
std::string session_id;
|
|
if (args->GetNext(&session_id) && session_id.empty()) {
|
|
promise.RejectWithErrorMessage("Empty session id is not allowed");
|
|
return handle;
|
|
}
|
|
|
|
base::Value::Dict request;
|
|
int request_id = ++previous_request_id_;
|
|
pending_requests_.emplace(request_id, std::move(promise));
|
|
request.Set("id", request_id);
|
|
request.Set("method", method);
|
|
if (!command_params.empty()) {
|
|
request.Set("params", std::move(command_params));
|
|
}
|
|
|
|
if (!session_id.empty()) {
|
|
request.Set("sessionId", session_id);
|
|
}
|
|
|
|
const auto json_args = base::WriteJson(request).value_or("");
|
|
agent_host_->DispatchProtocolMessage(this, base::as_byte_span(json_args));
|
|
|
|
return handle;
|
|
}
|
|
|
|
void Debugger::ClearPendingRequests() {
|
|
for (auto& it : pending_requests_)
|
|
it.second.RejectWithErrorMessage("target closed while handling command");
|
|
pending_requests_.clear();
|
|
}
|
|
|
|
// static
|
|
gin::Handle<Debugger> Debugger::Create(v8::Isolate* isolate,
|
|
content::WebContents* web_contents) {
|
|
return gin::CreateHandle(isolate, new Debugger(isolate, web_contents));
|
|
}
|
|
|
|
gin::ObjectTemplateBuilder Debugger::GetObjectTemplateBuilder(
|
|
v8::Isolate* isolate) {
|
|
return gin_helper::EventEmitterMixin<Debugger>::GetObjectTemplateBuilder(
|
|
isolate)
|
|
.SetMethod("attach", &Debugger::Attach)
|
|
.SetMethod("isAttached", &Debugger::IsAttached)
|
|
.SetMethod("detach", &Debugger::Detach)
|
|
.SetMethod("sendCommand", &Debugger::SendCommand);
|
|
}
|
|
|
|
const char* Debugger::GetTypeName() {
|
|
return "Debugger";
|
|
}
|
|
|
|
} // namespace electron::api
|