Skip to content

Commit 984f640

Browse files
islandryuislandryu
committed
format
1 parent cab3f96 commit 984f640

File tree

6 files changed

+90
-86
lines changed

6 files changed

+90
-86
lines changed

‎src/inspector/node_protocol.pdl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,4 +241,3 @@ experimental domain Target
241241
SessionID sessionId
242242
TargetInfo targetInfo
243243
boolean waitingForDebugger
244-

‎src/inspector/target_agent.cc

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,39 @@
11
#include "target_agent.h"
2-
#include <iostream>
3-
#include <memory>
4-
#include <set>
5-
#include <string>
6-
#include <tuple>
7-
#include <utility>
8-
#include "inspector/node_string.h"
92
#include "inspector/worker_inspector.h"
103
#include "main_thread_interface.h"
114

125
namespace node {
136
namespace inspector {
147
namespace protocol {
158

16-
std::unordered_map<int,std::shared_ptr<MainThreadHandle>> TargetAgent::target_session_id_worker_map_ = std::unordered_map<int, std::shared_ptr<MainThreadHandle>>();
17-
18-
9+
std::unordered_map<int, std::shared_ptr<MainThreadHandle>>
10+
TargetAgent::target_session_id_worker_map_ =
11+
std::unordered_map<int, std::shared_ptr<MainThreadHandle>>();
12+
int TargetAgent::next_session_id_ = 1;
1913
class WorkerTargetDelegate : public WorkerDelegate {
2014
public:
2115
explicit WorkerTargetDelegate(std::shared_ptr<TargetAgent> target_agent)
2216
: target_agent_(target_agent) {}
2317

24-
2518
void WorkerCreated(const std::string& title,
2619
const std::string& url,
2720
bool waiting,
2821
std::shared_ptr<MainThreadHandle> worker) override {
2922
std::string target_id = std::to_string(target_agent_->getNextTargetId());
3023
std::string type = "worker";
31-
24+
3225
target_agent_->targetCreated(target_id, type, title, url);
33-
target_agent_->attachedToTarget(worker,target_id, type, title, url);
26+
target_agent_->attachedToTarget(worker, target_id, type, title, url);
3427
}
3528

3629
private:
3730
const std::shared_ptr<TargetAgent> target_agent_;
3831
};
3932

40-
std::unique_ptr<Target::TargetInfo> createTargetInfo(
41-
const String& target_id,
42-
const String& type,
43-
const String& title,
44-
const String& url) {
33+
std::unique_ptr<Target::TargetInfo> createTargetInfo(const String& target_id,
34+
const String& type,
35+
const String& title,
36+
const String& url) {
4537
return Target::TargetInfo::create()
4638
.setTargetId(target_id)
4739
.setType(type)
@@ -62,7 +54,8 @@ void TargetAgent::listenWorker(std::weak_ptr<WorkerManager> worker_manager) {
6254
if (!manager) {
6355
return;
6456
}
65-
std::unique_ptr<WorkerDelegate> delegate(new WorkerTargetDelegate(shared_from_this()));
57+
std::unique_ptr<WorkerDelegate> delegate(
58+
new WorkerTargetDelegate(shared_from_this()));
6659
worker_event_handle_ = manager->SetAutoAttach(std::move(delegate));
6760
}
6861

@@ -72,7 +65,10 @@ void TargetAgent::reset() {
7265
}
7366
}
7467

75-
void TargetAgent::targetCreated(const std::string &target_id,const std::string &type,const std::string &title,const std::string &url) {
68+
void TargetAgent::targetCreated(const std::string& target_id,
69+
const std::string& type,
70+
const std::string& title,
71+
const std::string& url) {
7672
frontend_->targetCreated(createTargetInfo(target_id, type, title, url));
7773
}
7874

@@ -84,13 +80,19 @@ int TargetAgent::getNextTargetId() {
8480
return next_target_id_++;
8581
}
8682

87-
void TargetAgent::attachedToTarget(std::shared_ptr<MainThreadHandle> worker,const std::string &target_id, const std::string &type,const std::string &title,const std::string &url) {
83+
void TargetAgent::attachedToTarget(std::shared_ptr<MainThreadHandle> worker,
84+
const std::string& target_id,
85+
const std::string& type,
86+
const std::string& title,
87+
const std::string& url) {
8888
int session_id = getNextSessionId();
8989
target_session_id_worker_map_[session_id] = worker;
9090
worker->SetTargetSessionId(session_id);
91-
frontend_->attachedToTarget(std::to_string(session_id), createTargetInfo(target_id, type, title, url), true);
91+
frontend_->attachedToTarget(std::to_string(session_id),
92+
createTargetInfo(target_id, type, title, url),
93+
true);
9294
}
9395

94-
} // namespace protocol
96+
} // namespace protocol
9597
} // namespace inspector
9698
} // namespace node

‎src/inspector/target_agent.h

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,39 +4,40 @@
44
#include "inspector/worker_inspector.h"
55
#include "node/inspector/protocol/Target.h"
66

7-
#include <memory>
8-
#include <string>
9-
#include <thread>
10-
#include <unordered_map>
11-
127
namespace node {
138

149
namespace inspector {
1510
class TargetInspector;
1611

1712
namespace protocol {
1813

19-
class TargetAgent : public Target::Backend, public std::enable_shared_from_this<TargetAgent>
20-
{
14+
class TargetAgent : public Target::Backend,
15+
public std::enable_shared_from_this<TargetAgent> {
2116
public:
22-
explicit TargetAgent() {}
23-
2417
void Wire(UberDispatcher* dispatcher);
2518

26-
27-
void targetCreated(const std::string &target_id, const std::string &type,const std::string &title,const std::string &url);
28-
void attachedToTarget(std::shared_ptr<MainThreadHandle> worker,const std::string &target_id, const std::string &type,const std::string &title,const std::string &url);
19+
void targetCreated(const std::string& target_id,
20+
const std::string& type,
21+
const std::string& title,
22+
const std::string& url);
23+
void attachedToTarget(std::shared_ptr<MainThreadHandle> worker,
24+
const std::string& target_id,
25+
const std::string& type,
26+
const std::string& title,
27+
const std::string& url);
2928

3029
int getNextTargetId();
3130

3231
void listenWorker(std::weak_ptr<WorkerManager> worker_manager);
3332
void reset();
34-
static std::unordered_map<int,std::shared_ptr<MainThreadHandle>> target_session_id_worker_map_;
33+
static std::unordered_map<int, std::shared_ptr<MainThreadHandle>>
34+
target_session_id_worker_map_;
35+
3536
private:
3637
int getNextSessionId();
3738
std::shared_ptr<Target::Frontend> frontend_;
3839
std::weak_ptr<WorkerManager> worker_manager_;
39-
int next_session_id_ = 1;
40+
static int next_session_id_;
4041
int next_target_id_ = 1;
4142
std::unique_ptr<WorkerManagerEventHandle> worker_event_handle_ = nullptr;
4243
};
@@ -46,4 +47,3 @@ class TargetAgent : public Target::Backend, public std::enable_shared_from_this<
4647
} // namespace node
4748

4849
#endif // SRC_INSPECTOR_TARGET_AGENT_H_
49-

‎src/inspector_agent.cc

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#include "inspector_agent.h"
2-
#include <string>
32

43
#include "crdtp/json.h"
54
#include "env-inl.h"
@@ -22,7 +21,6 @@
2221
#include "permission/permission.h"
2322
#include "timer_wrap-inl.h"
2423
#include "util-inl.h"
25-
#include "util.h"
2624
#include "v8-inspector.h"
2725
#include "v8-platform.h"
2826

@@ -224,11 +222,10 @@ class ChannelImpl final : public v8_inspector::V8Inspector::Channel,
224222
const std::unique_ptr<V8Inspector>& inspector,
225223
std::shared_ptr<WorkerManager> worker_manager,
226224
std::unique_ptr<InspectorSessionDelegate> delegate,
227-
std::shared_ptr<MainThreadHandle> main_thread_,
225+
std::shared_ptr<MainThreadHandle> main_thread,
228226
bool prevent_shutdown)
229-
: delegate_(std::move(delegate)), main_thread_(main_thread_),
230-
prevent_shutdown_(prevent_shutdown), retaining_context_(false)
231-
{
227+
: delegate_(std::move(delegate)), main_thread_(main_thread),
228+
prevent_shutdown_(prevent_shutdown), retaining_context_(false) {
232229
session_ = inspector->connect(CONTEXT_GROUP_ID,
233230
this,
234231
StringView(),
@@ -245,7 +242,7 @@ class ChannelImpl final : public v8_inspector::V8Inspector::Channel,
245242
runtime_agent_->Wire(node_dispatcher_.get());
246243
network_inspector_ = std::make_unique<NetworkInspector>(env);
247244
network_inspector_->Wire(node_dispatcher_.get());
248-
if(env->options()->experimental_worker_inspection) {
245+
if (env->options()->experimental_worker_inspection) {
249246
target_agent_ = std::make_shared<protocol::TargetAgent>();
250247
target_agent_->Wire(node_dispatcher_.get());
251248
target_agent_->listenWorker(worker_manager);
@@ -263,7 +260,7 @@ class ChannelImpl final : public v8_inspector::V8Inspector::Channel,
263260
runtime_agent_.reset(); // Dispose before the dispatchers
264261
network_inspector_->Disable();
265262
network_inspector_.reset(); // Dispose before the dispatchers
266-
if(target_agent_) {
263+
if (target_agent_) {
267264
target_agent_->reset();
268265
}
269266
}
@@ -369,17 +366,18 @@ class ChannelImpl final : public v8_inspector::V8Inspector::Channel,
369366
}
370367
std::optional<int> target_session_id = main_thread_->GetTargetSessionId();
371368
if (target_session_id.has_value()) {
369+
std::string raw_message = protocol::StringUtil::StringViewToUtf8(message);
372370
std::unique_ptr<protocol::DictionaryValue> value =
373371
protocol::DictionaryValue::cast(
374-
JsonUtil::parseJSON(message));
372+
JsonUtil::parseJSON(raw_message));
375373
std::string target_session_id_str = std::to_string(*target_session_id);
376374
value->setString("sessionId", target_session_id_str);
377375
std::string json = serializeToJSON(std::move(value));
378-
379-
delegate_->SendMessageToFrontend(Utf8ToStringView(json)->string());
376+
delegate_->SendMessageToFrontend(
377+
Utf8ToStringView(json)->string());
378+
} else {
379+
delegate_->SendMessageToFrontend(message);
380380
}
381-
382-
delegate_->SendMessageToFrontend(message);
383381
}
384382

385383
void sendMessageToFrontend(const std::string& message) {
@@ -414,7 +412,7 @@ class ChannelImpl final : public v8_inspector::V8Inspector::Channel,
414412
std::unique_ptr<NetworkInspector> network_inspector_;
415413
std::unique_ptr<InspectorSessionDelegate> delegate_;
416414
std::unique_ptr<v8_inspector::V8InspectorSession> session_;
417-
std::unique_ptr<protocol::UberDispatcher> node_dispatcher_;
415+
std::unique_ptr<UberDispatcher> node_dispatcher_;
418416
std::shared_ptr<MainThreadHandle> main_thread_;
419417
bool prevent_shutdown_;
420418
bool retaining_context_;

‎src/inspector_io.cc

Lines changed: 30 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include "inspector/main_thread_interface.h"
77
#include "inspector/node_json.h"
88
#include "inspector/node_string.h"
9+
#include "inspector/target_agent.h"
910
#include "inspector_socket_server.h"
1011
#include "ncrypto.h"
1112
#include "node.h"
@@ -14,7 +15,6 @@
1415
#include "util-inl.h"
1516
#include "v8-inspector.h"
1617
#include "zlib.h"
17-
#include "inspector/target_agent.h"
1818

1919
#include <deque>
2020
#include <cstring>
@@ -69,9 +69,9 @@ class RequestToServer {
6969
RequestToServer(TransportAction action,
7070
int session_id,
7171
std::unique_ptr<v8_inspector::StringBuffer> message)
72-
: action_(action),
73-
session_id_(session_id),
74-
message_(std::move(message)) {}
72+
: action_(action),
73+
session_id_(session_id),
74+
message_(std::move(message)) {}
7575

7676
void Dispatch(InspectorSocketServer* server) const {
7777
switch (action_) {
@@ -100,7 +100,7 @@ class RequestQueueData {
100100
using MessageQueue = std::deque<RequestToServer>;
101101

102102
explicit RequestQueueData(uv_loop_t* loop)
103-
: handle_(std::make_shared<RequestQueue>(this)) {
103+
: handle_(std::make_shared<RequestQueue>(this)) {
104104
int err = uv_async_init(loop, &async_, [](uv_async_t* async) {
105105
RequestQueueData* wrapper =
106106
node::ContainerOf(&RequestQueueData::async_, async);
@@ -343,11 +343,11 @@ void InspectorIoDelegate::StartSession(int session_id,
343343
fprintf(stderr, "Debugger attached.\n");
344344
}
345345

346-
std::optional<std::string> InspectorIoDelegate::GetTargetSessionId(const std::string& message) {
347-
const std::string_view view(message.data(), message.size());
346+
std::optional<std::string> InspectorIoDelegate::GetTargetSessionId(
347+
const std::string& message) {
348+
std::string_view view(message.data(), message.size());
348349
std::unique_ptr<protocol::DictionaryValue> value =
349-
protocol::DictionaryValue::cast(
350-
JsonUtil::parseJSON(view));
350+
protocol::DictionaryValue::cast(JsonUtil::parseJSON(view));
351351
protocol::String target_session_id;
352352
protocol::Value* target_session_id_value = value->get("sessionId");
353353
if (target_session_id_value) {
@@ -362,34 +362,39 @@ std::optional<std::string> InspectorIoDelegate::GetTargetSessionId(const std::st
362362

363363
void InspectorIoDelegate::MessageReceived(int session_id,
364364
const std::string& message) {
365-
std::optional<std::string> target_session_id_str = GetTargetSessionId(message);
365+
std::optional<std::string> target_session_id_str =
366+
GetTargetSessionId(message);
366367
std::shared_ptr<MainThreadHandle> worker = nullptr;
367368
int merged_session_id = session_id;
368-
if(!target_session_id_str->empty()) {
369+
if (!target_session_id_str->empty()) {
369370
int target_session_id = std::stoi(*target_session_id_str);
370-
worker = protocol::TargetAgent::target_session_id_worker_map_[target_session_id];
371-
if(worker) {
371+
worker =
372+
protocol::TargetAgent::target_session_id_worker_map_[target_session_id];
373+
if (worker) {
372374
merged_session_id += target_session_id << 16;
373375
}
374376
}
375377

376378
auto session = sessions_.find(merged_session_id);
377379

378-
if(session == sessions_.end()) {
380+
if (session == sessions_.end()) {
379381
std::unique_ptr<InspectorSession> session;
380-
if(worker) {
382+
if (worker) {
381383
session = worker->Connect(
382-
std::unique_ptr<InspectorSessionDelegate>(
383-
new IoSessionDelegate(request_queue_->handle(), session_id)), true);
384+
std::unique_ptr<InspectorSessionDelegate>(
385+
new IoSessionDelegate(request_queue_->handle(), session_id)),
386+
true);
384387
} else {
385388
session = main_thread_->Connect(
386-
std::unique_ptr<InspectorSessionDelegate>(
387-
new IoSessionDelegate(request_queue_->handle(), session_id)), true);
389+
std::unique_ptr<InspectorSessionDelegate>(
390+
new IoSessionDelegate(request_queue_->handle(), session_id)),
391+
true);
388392
}
389393

390394
if (session) {
391395
sessions_[merged_session_id] = std::move(session);
392-
sessions_[merged_session_id]->Dispatch(Utf8ToStringView(message)->string());
396+
sessions_[merged_session_id]->Dispatch(
397+
Utf8ToStringView(message)->string());
393398
} else {
394399
fprintf(stderr, "Failed to connect to inspector session.\n");
395400
}
@@ -420,11 +425,11 @@ void RequestQueueData::CloseAndFree(RequestQueueData* queue) {
420425
queue->handle_.reset();
421426
uv_close(reinterpret_cast<uv_handle_t*>(&queue->async_),
422427
[](uv_handle_t* handle) {
423-
uv_async_t* async = reinterpret_cast<uv_async_t*>(handle);
424-
RequestQueueData* wrapper =
425-
node::ContainerOf(&RequestQueueData::async_, async);
426-
delete wrapper;
427-
});
428+
uv_async_t* async = reinterpret_cast<uv_async_t*>(handle);
429+
RequestQueueData* wrapper =
430+
node::ContainerOf(&RequestQueueData::async_, async);
431+
delete wrapper;
432+
});
428433
}
429434
} // namespace inspector
430435
} // namespace node

‎test/parallel/test-inspector-worker-target.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Flags: --experimental-worker-inspection
1+
// Flags: --inspect=0 --experimental-worker-inspection
22
'use strict';
33

44
const common = require('../common');
@@ -14,14 +14,14 @@ const session = new Session();
1414

1515
session.connect();
1616

17-
new Worker(fixtures.path("worker-script.mjs"), { type: 'module' });
18-
session.on("Target.targetCreated", common.mustCall(({ params }) => {
17+
new Worker(fixtures.path('worker-script.mjs'), { type: 'module' });
18+
session.on('Target.targetCreated', common.mustCall(({ params }) => {
1919
const targetInfo = params.targetInfo;
20-
assert.strictEqual(targetInfo.type, "worker");
21-
assert.ok(targetInfo.url.includes("worker-script.mjs"));
22-
assert.strictEqual(targetInfo.targetId, "1");
20+
assert.strictEqual(targetInfo.type, 'worker');
21+
assert.ok(targetInfo.url.includes('worker-script.mjs'));
22+
assert.strictEqual(targetInfo.targetId, '1');
2323
}));
2424

25-
session.on("Target.attachedToTarget", common.mustCall(({ params }) => {
26-
assert.strictEqual(params.sessionId, "1");
25+
session.on('Target.attachedToTarget', common.mustCall(({ params }) => {
26+
assert.strictEqual(params.sessionId, '1');
2727
}));

0 commit comments

Comments
 (0)