From 960cee3f85fbffc000cfeee403fce8a49b9d93c1 Mon Sep 17 00:00:00 2001
From: Santiago Gimeno <santiago.gimeno@gmail.com>
Date: Tue, 5 Dec 2023 13:33:44 +0100
Subject: [PATCH] src: guard nsolid headers with NODE_WANT_INTERNALS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PR-URL: https://github.com/nodesource/nsolid/pull/
Reviewed-by: Trevor Norris <trev.norris@gmail.com>
Reviewed-by: Juan José Arboleda <soyjuanarbol@gmail.com>
---
 src/nsolid/lru_map.h                         | 5 ++++-
 src/nsolid/nsolid_api.h                      | 4 ++++
 src/nsolid/nsolid_bindings.h                 | 5 +++--
 src/nsolid/nsolid_cpu_profiler.h             | 4 ++++
 src/nsolid/nsolid_heap_snapshot.h            | 4 ++++
 src/nsolid/nsolid_output_stream.h            | 4 ++++
 src/nsolid/nsolid_trace.h                    | 4 ++++
 src/nsolid/nsolid_util.h                     | 5 ++++-
 src/nsolid/spinlock.h                        | 4 ++++
 src/nsolid/thread_safe.h                     | 4 ++++
 test/addons/nsolid-agent-id/binding.gyp      | 1 +
 test/addons/nsolid-config-hooks/binding.gyp  | 1 +
 test/addons/nsolid-dispatchqueue/binding.gyp | 1 +
 test/addons/nsolid-env-hooks/binding.gyp     | 1 +
 test/addons/nsolid-eventloop-cmd/binding.gyp | 1 +
 test/addons/nsolid-exit/binding.gyp          | 1 +
 test/addons/nsolid-proc-metrics/binding.gyp  | 1 +
 test/addons/nsolid-queue-cb/binding.gyp      | 1 +
 test/addons/nsolid-run-command/binding.gyp   | 1 +
 19 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/src/nsolid/lru_map.h b/src/nsolid/lru_map.h
index ff42745c528..2ce44d90419 100644
--- a/src/nsolid/lru_map.h
+++ b/src/nsolid/lru_map.h
@@ -1,6 +1,8 @@
 #ifndef SRC_NSOLID_LRU_MAP_H_
 #define SRC_NSOLID_LRU_MAP_H_
 
+#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #include <cassert>
 #include <deque>
 #include <functional>
@@ -122,8 +124,9 @@ class LRUMap {
   cb_proxy_sig proxy_;
 };
 
-
 }  // namespace nsolid
 }  // namespace node
 
+#endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #endif  // SRC_NSOLID_LRU_MAP_H_
diff --git a/src/nsolid/nsolid_api.h b/src/nsolid/nsolid_api.h
index 199d3e731a8..f44f74a8929 100644
--- a/src/nsolid/nsolid_api.h
+++ b/src/nsolid/nsolid_api.h
@@ -1,6 +1,8 @@
 #ifndef SRC_NSOLID_NSOLID_API_H_
 #define SRC_NSOLID_NSOLID_API_H_
 
+#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #include <atomic>
 #include <functional>
 #include <list>
@@ -912,4 +914,6 @@ inline uv_loop_t* EnvList::thread_loop() {
 }  // namespace nsolid
 }  // namespace node
 
+#endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #endif  // SRC_NSOLID_NSOLID_API_H_
diff --git a/src/nsolid/nsolid_bindings.h b/src/nsolid/nsolid_bindings.h
index 99cb44e60b9..50e39006fbe 100644
--- a/src/nsolid/nsolid_bindings.h
+++ b/src/nsolid/nsolid_bindings.h
@@ -1,6 +1,7 @@
 #ifndef SRC_NSOLID_NSOLID_BINDINGS_H_
 #define SRC_NSOLID_NSOLID_BINDINGS_H_
 
+#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
 
 #include "node_snapshotable.h"
 
@@ -72,9 +73,9 @@ class BindingData : public SnapshotableObject {
   static v8::CFunction fast_push_span_data_uint64_;
 };
 
-
-
 }  // namespace nsolid
 }  // namespace node
 
+#endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #endif  // SRC_NSOLID_NSOLID_BINDINGS_H_
diff --git a/src/nsolid/nsolid_cpu_profiler.h b/src/nsolid/nsolid_cpu_profiler.h
index 10fe5aeecff..df3972d21c9 100644
--- a/src/nsolid/nsolid_cpu_profiler.h
+++ b/src/nsolid/nsolid_cpu_profiler.h
@@ -1,6 +1,8 @@
 #ifndef SRC_NSOLID_NSOLID_CPU_PROFILER_H_
 #define SRC_NSOLID_NSOLID_CPU_PROFILER_H_
 
+#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #include <map>
 #include "nsolid.h"
 #include "nsolid/nsolid_util.h"
@@ -88,4 +90,6 @@ class NSolidCpuProfiler {
 }  // namespace nsolid
 }  // namespace node
 
+#endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #endif  // SRC_NSOLID_NSOLID_CPU_PROFILER_H_
diff --git a/src/nsolid/nsolid_heap_snapshot.h b/src/nsolid/nsolid_heap_snapshot.h
index d295aad27b8..c5c91e9a129 100644
--- a/src/nsolid/nsolid_heap_snapshot.h
+++ b/src/nsolid/nsolid_heap_snapshot.h
@@ -1,6 +1,8 @@
 #ifndef SRC_NSOLID_NSOLID_HEAP_SNAPSHOT_H_
 #define SRC_NSOLID_NSOLID_HEAP_SNAPSHOT_H_
 
+#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #include <v8.h>
 #include <v8-profiler.h>
 #include <nsolid/nsolid_api.h>
@@ -50,4 +52,6 @@ class NSolidHeapSnapshot {
 }  // namespace nsolid
 }  // namespace node
 
+#endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #endif  // SRC_NSOLID_NSOLID_HEAP_SNAPSHOT_H_
diff --git a/src/nsolid/nsolid_output_stream.h b/src/nsolid/nsolid_output_stream.h
index ff94fab2e4c..c5b33e9637b 100644
--- a/src/nsolid/nsolid_output_stream.h
+++ b/src/nsolid/nsolid_output_stream.h
@@ -1,6 +1,8 @@
 #ifndef SRC_NSOLID_NSOLID_OUTPUT_STREAM_H_
 #define SRC_NSOLID_NSOLID_OUTPUT_STREAM_H_
 
+#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #include <v8.h>
 #include <v8-profiler.h>
 
@@ -83,4 +85,6 @@ class DataOutputStream : public v8::OutputStream {
 }  // namespace nsolid
 }  // namespace node
 
+#endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #endif  // SRC_NSOLID_NSOLID_OUTPUT_STREAM_H_
diff --git a/src/nsolid/nsolid_trace.h b/src/nsolid/nsolid_trace.h
index 9ec421703ce..4cdb02a5141 100644
--- a/src/nsolid/nsolid_trace.h
+++ b/src/nsolid/nsolid_trace.h
@@ -1,6 +1,8 @@
 #ifndef SRC_NSOLID_NSOLID_TRACE_H_
 #define SRC_NSOLID_NSOLID_TRACE_H_
 
+#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #include <array>
 #include <cstdint>
 #include <memory>
@@ -226,4 +228,6 @@ const Type& SpanPropBase::val() const {
 }  // namespace nsolid
 }  // namespace node
 
+#endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #endif  // SRC_NSOLID_NSOLID_TRACE_H_
diff --git a/src/nsolid/nsolid_util.h b/src/nsolid/nsolid_util.h
index d4948bdf5ac..8c084a0b11a 100644
--- a/src/nsolid/nsolid_util.h
+++ b/src/nsolid/nsolid_util.h
@@ -1,6 +1,8 @@
 #ifndef SRC_NSOLID_NSOLID_UTIL_H_
 #define SRC_NSOLID_NSOLID_UTIL_H_
 
+#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #include <algorithm>
 #include <array>
 #include <chrono> // NOLINT [build/c++11]
@@ -191,9 +193,10 @@ class ring_buffer {
   std::vector<double> buffer_;
 };
 
-
 }  // namespace utils
 }  // namespace nsolid
 }  // namespace node
 
+#endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #endif  // SRC_NSOLID_NSOLID_UTIL_H_
diff --git a/src/nsolid/spinlock.h b/src/nsolid/spinlock.h
index ad475de5adf..87f6acf9201 100644
--- a/src/nsolid/spinlock.h
+++ b/src/nsolid/spinlock.h
@@ -1,6 +1,8 @@
 #ifndef SRC_NSOLID_SPINLOCK_H_
 #define SRC_NSOLID_SPINLOCK_H_
 
+#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #include <atomic>
 
 namespace node {
@@ -42,4 +44,6 @@ class Spinlock {
 }  // namespace nsolid
 }  // namespace node
 
+#endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #endif  // SRC_NSOLID_SPINLOCK_H_
diff --git a/src/nsolid/thread_safe.h b/src/nsolid/thread_safe.h
index 60a7a59daa2..a4d2e825a63 100644
--- a/src/nsolid/thread_safe.h
+++ b/src/nsolid/thread_safe.h
@@ -1,6 +1,8 @@
 #ifndef SRC_NSOLID_THREAD_SAFE_H_
 #define SRC_NSOLID_THREAD_SAFE_H_
 
+#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #include "spinlock.h"
 #include "../../deps/nsuv/include/nsuv-inl.h"
 
@@ -195,4 +197,6 @@ struct TSList<DataType*> {
 
 #undef NSOLID_WUR
 
+#endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #endif  // SRC_NSOLID_THREAD_SAFE_H_
diff --git a/test/addons/nsolid-agent-id/binding.gyp b/test/addons/nsolid-agent-id/binding.gyp
index 55fbe7050f1..cfe54914f28 100644
--- a/test/addons/nsolid-agent-id/binding.gyp
+++ b/test/addons/nsolid-agent-id/binding.gyp
@@ -4,6 +4,7 @@
       'target_name': 'binding',
       'sources': [ 'binding.cc' ],
       'includes': ['../common.gypi'],
+      'defines': [ 'NODE_WANT_INTERNALS=1' ],
     }
   ]
 }
diff --git a/test/addons/nsolid-config-hooks/binding.gyp b/test/addons/nsolid-config-hooks/binding.gyp
index 55fbe7050f1..cfe54914f28 100644
--- a/test/addons/nsolid-config-hooks/binding.gyp
+++ b/test/addons/nsolid-config-hooks/binding.gyp
@@ -4,6 +4,7 @@
       'target_name': 'binding',
       'sources': [ 'binding.cc' ],
       'includes': ['../common.gypi'],
+      'defines': [ 'NODE_WANT_INTERNALS=1' ],
     }
   ]
 }
diff --git a/test/addons/nsolid-dispatchqueue/binding.gyp b/test/addons/nsolid-dispatchqueue/binding.gyp
index 55fbe7050f1..cfe54914f28 100644
--- a/test/addons/nsolid-dispatchqueue/binding.gyp
+++ b/test/addons/nsolid-dispatchqueue/binding.gyp
@@ -4,6 +4,7 @@
       'target_name': 'binding',
       'sources': [ 'binding.cc' ],
       'includes': ['../common.gypi'],
+      'defines': [ 'NODE_WANT_INTERNALS=1' ],
     }
   ]
 }
diff --git a/test/addons/nsolid-env-hooks/binding.gyp b/test/addons/nsolid-env-hooks/binding.gyp
index 55fbe7050f1..cfe54914f28 100644
--- a/test/addons/nsolid-env-hooks/binding.gyp
+++ b/test/addons/nsolid-env-hooks/binding.gyp
@@ -4,6 +4,7 @@
       'target_name': 'binding',
       'sources': [ 'binding.cc' ],
       'includes': ['../common.gypi'],
+      'defines': [ 'NODE_WANT_INTERNALS=1' ],
     }
   ]
 }
diff --git a/test/addons/nsolid-eventloop-cmd/binding.gyp b/test/addons/nsolid-eventloop-cmd/binding.gyp
index 55fbe7050f1..cfe54914f28 100644
--- a/test/addons/nsolid-eventloop-cmd/binding.gyp
+++ b/test/addons/nsolid-eventloop-cmd/binding.gyp
@@ -4,6 +4,7 @@
       'target_name': 'binding',
       'sources': [ 'binding.cc' ],
       'includes': ['../common.gypi'],
+      'defines': [ 'NODE_WANT_INTERNALS=1' ],
     }
   ]
 }
diff --git a/test/addons/nsolid-exit/binding.gyp b/test/addons/nsolid-exit/binding.gyp
index 55fbe7050f1..cfe54914f28 100644
--- a/test/addons/nsolid-exit/binding.gyp
+++ b/test/addons/nsolid-exit/binding.gyp
@@ -4,6 +4,7 @@
       'target_name': 'binding',
       'sources': [ 'binding.cc' ],
       'includes': ['../common.gypi'],
+      'defines': [ 'NODE_WANT_INTERNALS=1' ],
     }
   ]
 }
diff --git a/test/addons/nsolid-proc-metrics/binding.gyp b/test/addons/nsolid-proc-metrics/binding.gyp
index 55fbe7050f1..cfe54914f28 100644
--- a/test/addons/nsolid-proc-metrics/binding.gyp
+++ b/test/addons/nsolid-proc-metrics/binding.gyp
@@ -4,6 +4,7 @@
       'target_name': 'binding',
       'sources': [ 'binding.cc' ],
       'includes': ['../common.gypi'],
+      'defines': [ 'NODE_WANT_INTERNALS=1' ],
     }
   ]
 }
diff --git a/test/addons/nsolid-queue-cb/binding.gyp b/test/addons/nsolid-queue-cb/binding.gyp
index 55fbe7050f1..cfe54914f28 100644
--- a/test/addons/nsolid-queue-cb/binding.gyp
+++ b/test/addons/nsolid-queue-cb/binding.gyp
@@ -4,6 +4,7 @@
       'target_name': 'binding',
       'sources': [ 'binding.cc' ],
       'includes': ['../common.gypi'],
+      'defines': [ 'NODE_WANT_INTERNALS=1' ],
     }
   ]
 }
diff --git a/test/addons/nsolid-run-command/binding.gyp b/test/addons/nsolid-run-command/binding.gyp
index 55fbe7050f1..cfe54914f28 100644
--- a/test/addons/nsolid-run-command/binding.gyp
+++ b/test/addons/nsolid-run-command/binding.gyp
@@ -4,6 +4,7 @@
       'target_name': 'binding',
       'sources': [ 'binding.cc' ],
       'includes': ['../common.gypi'],
+      'defines': [ 'NODE_WANT_INTERNALS=1' ],
     }
   ]
 }