8532e1239e
* chore: bump chromium in DEPS to 92.0.4512.6
* 2887336: [CaptureHandle][#2] Propagate CaptureHandleConfig in browser process
https://chromium-review.googlesource.com/c/chromium/src/+/2887336
* refactor: base::Optional -> absl::optional
* chore: fixup patch indices
* chore: bump chromium in DEPS to 92.0.4514.0
* 2899417: Make build work when enable_pdf is set to false.
https://chromium-review.googlesource.com/c/chromium/src/+/2899417
* 2904731: use BrowserContext instead of Profile in PreconnectManager
https://chromium-review.googlesource.com/c/chromium/src/+/2904731
* 2295749: fix: check IsSecureEventInputEnabled in constructor before setting SetPasswordInputEnabled to true
https://chromium-review.googlesource.com/c/chromium/src/+/2295749
* 2893803: Add a GetWebView to RenderFrame.
https://chromium-review.googlesource.com/c/chromium/src/+/2893803
* 2892345: Implement WebContents::ForEachRenderFrameHost
https://chromium-review.googlesource.com/c/chromium/src/+/2892345
* chore: fixup patch indices
* 2892048: Real instance methods for BrowserContext: remaining 5 methods.
https://chromium-review.googlesource.com/c/chromium/src/+/2892048
* 2902821: [mojo] Don't require full header includes for referenced interfaces
https://chromium-review.googlesource.com/c/chromium/src/+/2902821
* 2496500: Remove last deprecated extension Event ctor.
https://chromium-review.googlesource.com/c/chromium/src/+/2496500
* chore: fixup malformed pepper support patch
* chore: bump chromium in DEPS to 92.0.4515.0
* 2908461: Add CreateEmptyPrintPagesParamsPtr() inside print_view_manager_base.cc.
https://chromium-review.googlesource.com/c/chromium/src/+/2908461
* 2880838: viz: add optional HDRMetadata to TransferableResource
https://chromium-review.googlesource.com/c/chromium/src/+/2880838
* chore: fixup patch indices
* chore: bump chromium in DEPS to 92.0.4515.5
* chore: update patches
* chore: bump chromium in DEPS to 92.0.4515.7
* chore: bump chromium in DEPS to 92.0.4515.9
* chore: bump chromium in DEPS to 93.0.4522.0
* chore: bump chromium in DEPS to 93.0.4523.0
* chore: bump chromium in DEPS to 93.0.4524.0
* chore: update patches
* chore: enable_pak_file_integrity_checks was reverted
* chore: update patches
* refactor: base/optional was replaced with absl::optional
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* refactor: replace all usages of base::nullopt with absl::nullopt
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* chore: add missing base::Contains include
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* refactor: replace all usages of base::make_optional with
absl::make_optional
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* refactor: replace WorldScriptContext() with GetScriptContextFromWorldId
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2893213
* chore: clean up left over opening namespace
Refs: 95bfe6d08f
* chore: add missing base::Contains include
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* refactor: replace GetCurrentDisplayIterator with the hard checker
GetCurrentDisplay
This code looks suspicious but if the iterator was invalid before it
will also be invalid now.
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2893191
* refactor: headers are now passed directly in extensions client
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2918906
* refactor: base::DictionaryValue::empty() has been removed
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2912424
* chore: add missing includes for network URLLoaderFactory
Refs: unknown, probably a side effect of header changes
* refactor: make convenience wrapper around AppendArg
There is no converter FromV8 for base::StringPiece (apparently its not
possible). So we now take in an std::string and use the construct for
StringPiece to do implicit conversion.
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2905544
* chore: add patch
* chore: bump chromium in DEPS to 93.0.4525.0
* chore: update patches
* refactor: CanResize has been de-virtualized
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2485774
* chore: update resource integrity patch
* chore: add character encoding idl patch
* chore: bump chromium in DEPS to 93.0.4526.0
* chore: update patches
* chore: bump chromium in DEPS to 93.0.4527.0
* chore: bump chromium in DEPS to 93.0.4528.0
* chore: update patches
* chore: update idl encoding patch
* chore: bump chromium in DEPS to 93.0.4529.0
* chore: update patches
* chore: bump chromium in DEPS to 93.0.4530.0
* chore: update patches
* fix: only SetCanResize after the widget has been initialized
* chore: add patch for vr on windows gn gen
* spec: fix focus related tests on linux due to delay in focus swap
* chore: remove new usages of base::Optional from main
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Samuel Attard <sattard@slack-corp.com>
Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
213 lines
6.3 KiB
C++
213 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 <memory>
|
|
#include <string>
|
|
#include <utility>
|
|
|
|
#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/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/node_includes.h"
|
|
|
|
using content::DevToolsAgentHost;
|
|
|
|
namespace electron {
|
|
|
|
namespace api {
|
|
|
|
gin::WrapperInfo 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::Locker locker(isolate);
|
|
v8::HandleScope handle_scope(isolate);
|
|
|
|
base::StringPiece message_str(reinterpret_cast<const char*>(message.data()),
|
|
message.size());
|
|
std::unique_ptr<base::Value> parsed_message =
|
|
base::JSONReader::ReadDeprecated(message_str,
|
|
base::JSON_REPLACE_INVALID_CHARACTERS);
|
|
if (!parsed_message || !parsed_message->is_dict())
|
|
return;
|
|
auto* dict = static_cast<base::DictionaryValue*>(parsed_message.get());
|
|
int id;
|
|
if (!dict->GetInteger("id", &id)) {
|
|
std::string method;
|
|
if (!dict->GetString("method", &method))
|
|
return;
|
|
std::string session_id;
|
|
dict->GetString("sessionId", &session_id);
|
|
base::DictionaryValue* params_value = nullptr;
|
|
base::DictionaryValue params;
|
|
if (dict->GetDictionary("params", ¶ms_value))
|
|
params.Swap(params_value);
|
|
Emit("message", method, params, session_id);
|
|
} else {
|
|
auto it = pending_requests_.find(id);
|
|
if (it == pending_requests_.end())
|
|
return;
|
|
|
|
gin_helper::Promise<base::DictionaryValue> promise = std::move(it->second);
|
|
pending_requests_.erase(it);
|
|
|
|
base::DictionaryValue* error = nullptr;
|
|
if (dict->GetDictionary("error", &error)) {
|
|
std::string message;
|
|
error->GetString("message", &message);
|
|
promise.RejectWithErrorMessage(message);
|
|
} else {
|
|
base::DictionaryValue* result_body = nullptr;
|
|
base::DictionaryValue result;
|
|
if (dict->GetDictionary("result", &result_body)) {
|
|
result.Swap(result_body);
|
|
}
|
|
promise.Resolve(result);
|
|
}
|
|
}
|
|
}
|
|
|
|
void Debugger::RenderFrameHostChanged(content::RenderFrameHost* old_rfh,
|
|
content::RenderFrameHost* new_rfh) {
|
|
if (agent_host_) {
|
|
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::DictionaryValue> 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::DictionaryValue 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::DictionaryValue request;
|
|
int request_id = ++previous_request_id_;
|
|
pending_requests_.emplace(request_id, std::move(promise));
|
|
request.SetInteger("id", request_id);
|
|
request.SetString("method", method);
|
|
if (!command_params.DictEmpty()) {
|
|
request.Set("params",
|
|
base::Value::ToUniquePtrValue(command_params.Clone()));
|
|
}
|
|
|
|
if (!session_id.empty()) {
|
|
request.SetString("sessionId", session_id);
|
|
}
|
|
|
|
std::string json_args;
|
|
base::JSONWriter::Write(request, &json_args);
|
|
agent_host_->DispatchProtocolMessage(
|
|
this, base::as_bytes(base::make_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 api
|
|
|
|
} // namespace electron
|