src: avoid duplicating namespaces in node_internals.h

Signed-off-by: Juan José Arboleda <[email protected]>

Author: juanarbol

lib/v8.js

@@ -92,8 +92,12 @@ function writeHeapSnapshot(filename, options) {
     options.path = getValidatedPath(options.path);
   }
 
+  if (options?.encoding == undefined) {
+    options.encoding == 'utf8'
+  }
+
   const optionArray = getHeapSnapshotOptions(options);
-  return triggerHeapSnapshot(filename, optionArray, options?.path);
+  return triggerHeapSnapshot(filename, optionArray, options?.path, options.encoding);
 }
 
 /**

src/heap_utils.cc

@@ -6,6 +6,7 @@
 #include "permission/permission.h"
 #include "stream_base-inl.h"
 #include "util-inl.h"
+#include "string_bytes.h"
 
 // Copied from https://github.com/nodejs/node/blob/b07dc4d19fdbc15b4f76557dc45b3ce3a43ad0c3/src/util.cc#L36-L41.
 #ifdef _WIN32
@@ -448,14 +449,16 @@ void CreateHeapSnapshotStream(const FunctionCallbackInfo<Value>& args) {
 void TriggerHeapSnapshot(const FunctionCallbackInfo<Value>& args) {
   Environment* env = Environment::GetCurrent(args);
   Isolate* isolate = args.GetIsolate();
-  CHECK_EQ(args.Length(), 3);
+  CHECK_EQ(args.Length(), 4);
   Local<Value> filename_v = args[0];
   auto options = GetHeapSnapshotOptions(args[1]);
   bool has_path = !args[2]->IsUndefined() && !args[2]->IsNull();
   std::string final_filename;
   BufferValue path_v(isolate, args[2]);
   ToNamespacedPath(env, &path_v);
 
+  const enum encoding encoding = ParseEncoding(isolate, args[3], UTF8);
+
   if (filename_v->IsUndefined()) {
     DiagnosticFilename name(env, "Heap", "heapsnapshot");
     if (!has_path) {
@@ -492,8 +495,11 @@ void TriggerHeapSnapshot(const FunctionCallbackInfo<Value>& args) {
 
   if (WriteSnapshot(env, final_filename.c_str(), options).IsNothing()) return;
 
-  args.GetReturnValue().Set(
-      String::NewFromUtf8(isolate, final_filename.c_str()).ToLocalChecked());
+  Local<Value> ret;
+  if (StringBytes::Encode(isolate, final_filename.c_str(), encoding)
+          .ToLocal(&ret)) {
+    args.GetReturnValue().Set(ret);
+  }
 }
 
 void Initialize(Local<Object> target,

src/node_internals.h

@@ -447,16 +447,17 @@ namespace heap {
 v8::Maybe<void> WriteSnapshot(Environment* env,
                               const char* filename,
                               v8::HeapProfiler::HeapSnapshotOptions options);
-}
-
-namespace heap {
 
 void DeleteHeapSnapshot(const v8::HeapSnapshot* snapshot);
 using HeapSnapshotPointer =
   DeleteFnPtr<const v8::HeapSnapshot, DeleteHeapSnapshot>;
 
 BaseObjectPtr<AsyncWrap> CreateHeapSnapshotStream(
     Environment* env, HeapSnapshotPointer&& snapshot);
+
+v8::HeapProfiler::HeapSnapshotOptions GetHeapSnapshotOptions(
+    v8::Local<v8::Value> options);
+
 }  // namespace heap
 
 node_module napi_module_to_node_module(const napi_module* mod);
@@ -485,11 +486,6 @@ std::ostream& operator<<(std::ostream& output,
 
 bool linux_at_secure();
 
-namespace heap {
-v8::HeapProfiler::HeapSnapshotOptions GetHeapSnapshotOptions(
-    v8::Local<v8::Value> options);
-}  // namespace heap
-
 enum encoding ParseEncoding(v8::Isolate* isolate,
                             v8::Local<v8::Value> encoding_v,
                             v8::Local<v8::Value> encoding_id,