Working unwrapObject

Author: sjorsdonkers

src/binding.cpp

@@ -1607,9 +1607,16 @@ const char* allocStringWith0(const v8_inspector::String16& str, const void* allo
 /// The strings pointer and length should therefore be returned together
 /// @param str: The string contents to allocate
 /// @param allocator: A Zig std.mem.Allocator
-/// @param out_str: Points to the now allocated string on the heap (without sentinel \0)
+/// @param out_str: Points to the now allocated string on the heap (without sentinel \0),null if view was null or allocation failed
 /// @param out_len: The corresponding length of the string
-void allocString(const v8_inspector::StringView& str, const void* allocator, const char*& out_str, size_t& out_len) {
+/// @returns false if allocation errored
+bool allocString(const v8_inspector::StringView& str, const void* allocator, const char*& out_str, size_t& out_len) {
+    if (str.characters8() == nullptr) {
+        out_str = nullptr;
+        out_len = 0;
+        return true;
+    }
+
     std::string utf8_str; // Harmless if not used by 8bit string
     if (str.is8Bit()) {
         out_len = str.length();
@@ -1622,7 +1629,7 @@ void allocString(const v8_inspector::StringView& str, const void* allocator, con
     if (heap_str == nullptr) {
         out_str = nullptr;
         out_len = 0;
-        return;
+        return false;
     }
 
     if (str.is8Bit()) {
@@ -1631,7 +1638,7 @@ void allocString(const v8_inspector::StringView& str, const void* allocator, con
         memcpy(heap_str, utf8_str.c_str(), out_len);
     }
     out_str = heap_str;
-    return;
+    return true;
 }
 
 
@@ -1706,15 +1713,15 @@ v8_inspector::protocol::Runtime::RemoteObject* v8_inspector__Session__wrapObject
 
 bool v8_inspector__Session__unwrapObject(
     v8_inspector::V8InspectorSession *session,
-    const void* allocator,
-    const char* out_error,
-    uint64_t& out_error_len,
+    const void *allocator,
+    const char *&out_error,
+    uint64_t &out_error_len,
     const char *in_objectId,
     int in_objectId_len,
-    v8::Local<v8::Value> out_value,
-    v8::Local<v8::Context> out_context,
-    const char* out_objectGroup,
-    uint64_t& out_objectGroup_len
+    v8::Local<v8::Value> &out_value,
+    v8::Local<v8::Context> &out_context,
+    const char *&out_objectGroup,
+    uint64_t &out_objectGroup_len
 ) {
   auto objectId = toStringView(in_objectId, in_objectId_len);
   auto error = v8_inspector::StringBuffer::create({});
@@ -1730,8 +1737,7 @@ bool v8_inspector__Session__unwrapObject(
     allocString(error->string(), allocator, out_error, out_error_len);
     return false;
   }
-  allocString(objectGroup->string(), allocator, out_objectGroup, out_objectGroup_len);
-  return result;
+  return allocString(objectGroup->string(), allocator, out_objectGroup, out_objectGroup_len);
 }
 
 // RemoteObject

src/binding.h

@@ -1035,13 +1035,13 @@ RemoteObject* v8_inspector__Session__wrapObject(
 bool v8_inspector__Session__unwrapObject(
     InspectorSession *session,
     const void* allocator,
-    const char* out_error,
+    const char** out_error,
     uint64_t* out_error_len,
     const char *in_objectId,
-    int in_objectId_len,
-    Value out_value,
-    Context out_context,
-    const char* out_objectGroup,
+    uint64_t in_objectId_len,
+    Value** out_value,
+    Context** out_context,
+    const char** out_objectGroup,
     uint64_t* out_objectGroup_len
 );
 

src/v8.zig

@@ -2722,13 +2722,13 @@ pub const InspectorSession = struct {
 
     pub fn unwrapObject(self: InspectorSession, allocator: std.mem.Allocator, objectId: []const u8) !UnwrapResult {
         var out_error: [*c]const u8 = null;
-        var out_error_len: i64 = 0;
+        var out_error_len: u64 = 0;
 
         var out_value_handle: ?*c.Value = null;
         var out_context_handle: ?*c.Context = null;
 
         var out_objectGroup: [*c]const u8 = null;
-        var out_objectGroup_len: i64 = 0;
+        var out_objectGroup_len: u64 = 0;
 
         const result = c.v8_inspector__Session__unwrapObject(
             self.handle,
@@ -2739,17 +2739,18 @@ pub const InspectorSession = struct {
             objectId.len,
             &out_value_handle,
             &out_context_handle,
-            &out_objectGroup.ptr,
+            &out_objectGroup,
             &out_objectGroup_len,
         );
         if (!result) {
-            return .{ .err = out_error.?[0..out_error_len] };
+            return .{ .err = if (out_error != null) out_error[0..out_error_len] else null };
         }
+
         return .{
             .ok = .{
                 .value = Value{ .handle = out_value_handle.? },
                 .context = Context{ .handle = out_context_handle.? },
-                .objectGroup = out_objectGroup.?[0..out_objectGroup_len], // TODO can this be null?
+                .objectGroup = if (out_objectGroup != null) out_objectGroup[0..out_objectGroup_len] else null,
             },
         };
     }
@@ -2758,12 +2759,12 @@ pub const InspectorSession = struct {
 pub const UnwrappedObject = struct {
     value: Value,
     context: Context,
-    objectGroup: []const u8,
+    objectGroup: ?[]const u8,
 };
 pub const UnwrapResultEnum = enum { ok, err };
 pub const UnwrapResult = union(UnwrapResultEnum) {
     ok: UnwrappedObject,
-    err: []const u8,
+    err: ?[]const u8,
 };
 
 /// Note: Some getters return owned memory (strings), while others return memory owned by V8 (objects).