fixup! src: add C++ support for diagnostics channels

Author: RafaelGSS

src/node_diagnostics_channel.cc

@@ -25,9 +25,8 @@ BindingData::BindingData(Realm* realm,
                          Local<Object> wrap,
                          InternalFieldInfo* info)
     : SnapshotableObject(realm, wrap, type_int),
-      subscribers_(realm->isolate(),
-                   kMaxChannels,
-                   MAYBE_FIELD_PTR(info, subscribers)) {
+      subscribers_(
+          realm->isolate(), kMaxChannels, MAYBE_FIELD_PTR(info, subscribers)) {
   if (info == nullptr) {
     wrap->Set(realm->context(),
               FIXED_ONE_BYTE_STRING(realm->isolate(), "subscribers"),
@@ -67,8 +66,7 @@ void BindingData::GetOrCreateChannelIndex(
   args.GetReturnValue().Set(index);
 }
 
-void BindingData::SetPublishCallback(
-    const FunctionCallbackInfo<Value>& args) {
+void BindingData::SetPublishCallback(const FunctionCallbackInfo<Value>& args) {
   Realm* realm = Realm::GetCurrent(args);
   BindingData* binding = realm->GetBindingData<BindingData>();
   CHECK_NOT_NULL(binding);
@@ -82,8 +80,7 @@ bool BindingData::PrepareForSerialization(Local<Context> context,
                                           SnapshotCreator* creator) {
   DCHECK_NULL(internal_field_info_);
   internal_field_info_ = InternalFieldInfoBase::New<InternalFieldInfo>(type());
-  internal_field_info_->subscribers =
-      subscribers_.Serialize(context, creator);
+  internal_field_info_->subscribers = subscribers_.Serialize(context, creator);
   publish_callback_.Reset();
   return true;
 }
@@ -153,8 +150,7 @@ void Channel::Publish(Environment* env, Local<Value> message) const {
 
   if (binding_data_->publish_callback_.IsEmpty()) return;
 
-  Local<v8::Function> callback =
-      binding_data_->publish_callback_.Get(isolate);
+  Local<v8::Function> callback = binding_data_->publish_callback_.Get(isolate);
   Local<String> channel_name =
       String::NewFromUtf8(isolate, name_).ToLocalChecked();
 

src/node_diagnostics_channel.h

@@ -49,16 +49,13 @@ class BindingData : public SnapshotableObject {
   static void SetPublishCallback(
       const v8::FunctionCallbackInfo<v8::Value>& args);
 
-  static void CreatePerIsolateProperties(
-      IsolateData* isolate_data,
-      v8::Local<v8::ObjectTemplate> target);
-  static void CreatePerContextProperties(
-      v8::Local<v8::Object> target,
-      v8::Local<v8::Value> unused,
-      v8::Local<v8::Context> context,
-      void* priv);
-  static void RegisterExternalReferences(
-      ExternalReferenceRegistry* registry);
+  static void CreatePerIsolateProperties(IsolateData* isolate_data,
+                                         v8::Local<v8::ObjectTemplate> target);
+  static void CreatePerContextProperties(v8::Local<v8::Object> target,
+                                         v8::Local<v8::Value> unused,
+                                         v8::Local<v8::Context> context,
+                                         void* priv);
+  static void RegisterExternalReferences(ExternalReferenceRegistry* registry);
 
  private:
   InternalFieldInfo* internal_field_info_ = nullptr;

test/cctest/test_diagnostics_channel.cc

@@ -11,8 +11,7 @@ static v8::Local<v8::Value> RunJS(v8::Isolate* isolate, const char* code) {
   v8::Local<v8::Context> context = isolate->GetCurrentContext();
   v8::Local<v8::Script> script =
       v8::Script::Compile(
-          context,
-          v8::String::NewFromUtf8(isolate, code).ToLocalChecked())
+          context, v8::String::NewFromUtf8(isolate, code).ToLocalChecked())
           .ToLocalChecked();
   return script->Run(context).ToLocalChecked();
 }
@@ -29,9 +28,7 @@ TEST_F(DiagnosticsChannelTest, HasSubscribersReturnsFalseWithoutSubscribers) {
   });
 
   // Load the environment to initialize bindings.
-  node::LoadEnvironment(
-      *env,
-      "require('diagnostics_channel');");
+  node::LoadEnvironment(*env, "require('diagnostics_channel');");
 
   Channel ch = Channel::Get(*env, "test:cctest:no-subscribers");
   EXPECT_FALSE(ch.HasSubscribers());
@@ -48,10 +45,9 @@ TEST_F(DiagnosticsChannelTest, HasSubscribersReturnsTrueAfterSubscribe) {
     node::Stop(*env);
   });
 
-  node::LoadEnvironment(
-      *env,
-      "const dc = require('diagnostics_channel');"
-      "dc.subscribe('test:cctest:with-sub', () => {});");
+  node::LoadEnvironment(*env,
+                        "const dc = require('diagnostics_channel');"
+                        "dc.subscribe('test:cctest:with-sub', () => {});");
 
   Channel ch = Channel::Get(*env, "test:cctest:with-sub");
   EXPECT_TRUE(ch.HasSubscribers());
@@ -68,10 +64,9 @@ TEST_F(DiagnosticsChannelTest, GetReturnsSameChannelState) {
     node::Stop(*env);
   });
 
-  node::LoadEnvironment(
-      *env,
-      "const dc = require('diagnostics_channel');"
-      "dc.subscribe('test:cctest:same-channel', () => {});");
+  node::LoadEnvironment(*env,
+                        "const dc = require('diagnostics_channel');"
+                        "dc.subscribe('test:cctest:same-channel', () => {});");
 
   Channel ch1 = Channel::Get(*env, "test:cctest:same-channel");
   Channel ch2 = Channel::Get(*env, "test:cctest:same-channel");
@@ -108,7 +103,8 @@ TEST_F(DiagnosticsChannelTest, PublishDeliversToJSSubscribers) {
   v8::Local<v8::Object> msg = v8::Object::New(isolate_);
   msg->Set(context,
            v8::String::NewFromUtf8Literal(isolate_, "value"),
-           v8::Integer::New(isolate_, 42)).Check();
+           v8::Integer::New(isolate_, 42))
+      .Check();
 
   ch.Publish(*env, msg);
 
@@ -133,9 +129,8 @@ TEST_F(DiagnosticsChannelTest, CppChannelVisibleFromJS) {
   });
 
   // Expose dc on globalThis so RunJS (v8::Script) can access it.
-  node::LoadEnvironment(
-      *env,
-      "globalThis.__dc = require('diagnostics_channel');");
+  node::LoadEnvironment(*env,
+                        "globalThis.__dc = require('diagnostics_channel');");
 
   Channel ch = Channel::Get(*env, "test:cctest:cpp-first");
   EXPECT_FALSE(ch.HasSubscribers());
@@ -156,7 +151,8 @@ TEST_F(DiagnosticsChannelTest, CppChannelVisibleFromJS) {
   v8::Local<v8::Object> msg = v8::Object::New(isolate_);
   msg->Set(context,
            v8::String::NewFromUtf8Literal(isolate_, "from"),
-           v8::String::NewFromUtf8Literal(isolate_, "cpp")).Check();
+           v8::String::NewFromUtf8Literal(isolate_, "cpp"))
+      .Check();
 
   ch.Publish(*env, msg);
 
@@ -186,14 +182,13 @@ TEST_F(DiagnosticsChannelTest, JSChannelVisibleFromCpp) {
     node::Stop(*env);
   });
 
-  node::LoadEnvironment(
-      *env,
-      "const dc = require('diagnostics_channel');"
-      "globalThis.__dc = dc;"
-      "globalThis.__jsFirstMessages = [];"
-      "dc.subscribe('test:cctest:js-first', (msg) => {"
-      "  globalThis.__jsFirstMessages.push(msg);"
-      "});");
+  node::LoadEnvironment(*env,
+                        "const dc = require('diagnostics_channel');"
+                        "globalThis.__dc = dc;"
+                        "globalThis.__jsFirstMessages = [];"
+                        "dc.subscribe('test:cctest:js-first', (msg) => {"
+                        "  globalThis.__jsFirstMessages.push(msg);"
+                        "});");
 
   v8::Local<v8::Context> context = (*env)->context();
 
@@ -204,20 +199,21 @@ TEST_F(DiagnosticsChannelTest, JSChannelVisibleFromCpp) {
   v8::Local<v8::Object> msg1 = v8::Object::New(isolate_);
   msg1->Set(context,
             v8::String::NewFromUtf8Literal(isolate_, "seq"),
-            v8::Integer::New(isolate_, 1)).Check();
+            v8::Integer::New(isolate_, 1))
+      .Check();
   ch.Publish(*env, msg1);
 
   v8::Local<v8::Object> msg2 = v8::Object::New(isolate_);
   msg2->Set(context,
             v8::String::NewFromUtf8Literal(isolate_, "seq"),
-            v8::Integer::New(isolate_, 2)).Check();
+            v8::Integer::New(isolate_, 2))
+      .Check();
   ch.Publish(*env, msg2);
 
   v8::Local<v8::Value> msgs_val =
       context->Global()
           ->Get(context,
-                v8::String::NewFromUtf8Literal(isolate_,
-                                               "__jsFirstMessages"))
+                v8::String::NewFromUtf8Literal(isolate_, "__jsFirstMessages"))
           .ToLocalChecked();
   ASSERT_TRUE(msgs_val->IsArray());
   v8::Local<v8::Array> msgs = msgs_val.As<v8::Array>();