node-gtk 3.0.0 → 4.0.0

package/src/modules/cairo/font-extents.cc

@@ -28,8 +28,12 @@ void FontExtents::Initialize(Nan::ADDON_REGISTER_FUNCTION_ARGS_TYPE target) {
   tpl->InstanceTemplate()->SetInternalFieldCount(1);
   tpl->SetClassName(Nan::New("CairoFontExtents").ToLocalChecked());
 
-  // Prototype
-  Local<ObjectTemplate> proto = tpl->PrototypeTemplate();
+  // Accessors and indexed handlers must be installed on the instance
+  // template, not the prototype: in V8 14 property callbacks expose only
+  // HolderV2() (the holder). An accessor on the prototype would hand the
+  // callback the prototype object, which has no internal field, and
+  // Nan::ObjectWrap::Unwrap would abort. The instance carries the field.
+  Local<ObjectTemplate> proto = tpl->InstanceTemplate();
   SetProtoAccessor(proto, UTF8("ascent"),   GetAscent,   SetAscent,   tpl);
   SetProtoAccessor(proto, UTF8("descent"),  GetDescent,  SetDescent,  tpl);
   SetProtoAccessor(proto, UTF8("height"),   GetHeight,   SetHeight,   tpl);

package/src/modules/cairo/generator.js

@@ -133,7 +133,7 @@ function getSource(fn) {
     })() : '' }
     NAN_METHOD(${getJSName(fn.name)}) {
         auto self = info.This();
-        auto ${selfArgument.name} = (${getTypeName(selfArgument.type)}) self->GetAlignedPointerFromInternalField (0);
+        auto ${selfArgument.name} = (${getTypeName(selfArgument.type)}) Nan::GetInternalFieldPointer(self, 0);
 ${inArguments.length > 0 ? `
         // in-arguments
         ${inArguments.map(getInArgumentSource).join('\n        ')}

package/src/modules/cairo/glyph.cc

@@ -28,8 +28,12 @@ void Glyph::Initialize(Nan::ADDON_REGISTER_FUNCTION_ARGS_TYPE target) {
   tpl->InstanceTemplate()->SetInternalFieldCount(1);
   tpl->SetClassName(Nan::New("CairoGlyph").ToLocalChecked());
 
-  // Prototype
-  Local<ObjectTemplate> proto = tpl->PrototypeTemplate();
+  // Accessors and indexed handlers must be installed on the instance
+  // template, not the prototype: in V8 14 property callbacks expose only
+  // HolderV2() (the holder). An accessor on the prototype would hand the
+  // callback the prototype object, which has no internal field, and
+  // Nan::ObjectWrap::Unwrap would abort. The instance carries the field.
+  Local<ObjectTemplate> proto = tpl->InstanceTemplate();
   SetProtoAccessor(proto, UTF8("length"), GetLength, NULL,  tpl);
   Nan::SetIndexedPropertyHandler(proto, IndexGetter);
 

package/src/modules/cairo/path.cc

@@ -28,8 +28,12 @@ void Path::Initialize(Nan::ADDON_REGISTER_FUNCTION_ARGS_TYPE target) {
   tpl->InstanceTemplate()->SetInternalFieldCount(1);
   tpl->SetClassName(Nan::New("CairoPath").ToLocalChecked());
 
-  // Prototype
-  Local<ObjectTemplate> proto = tpl->PrototypeTemplate();
+  // Accessors and indexed handlers must be installed on the instance
+  // template, not the prototype: in V8 14 property callbacks expose only
+  // HolderV2() (the holder). An accessor on the prototype would hand the
+  // callback the prototype object, which has no internal field, and
+  // Nan::ObjectWrap::Unwrap would abort. The instance carries the field.
+  Local<ObjectTemplate> proto = tpl->InstanceTemplate();
   SetProtoAccessor(proto, UTF8("status"), GetStatus, NULL,  tpl);
 
   auto ctor = Nan::GetFunction (tpl).ToLocalChecked();

package/src/modules/cairo/rectangle-int.cc

@@ -28,8 +28,12 @@ void RectangleInt::Initialize(Nan::ADDON_REGISTER_FUNCTION_ARGS_TYPE target) {
   tpl->InstanceTemplate()->SetInternalFieldCount(1);
   tpl->SetClassName(Nan::New("CairoRectangleInt").ToLocalChecked());
 
-  // Prototype
-  Local<ObjectTemplate> proto = tpl->PrototypeTemplate();
+  // Accessors and indexed handlers must be installed on the instance
+  // template, not the prototype: in V8 14 property callbacks expose only
+  // HolderV2() (the holder). An accessor on the prototype would hand the
+  // callback the prototype object, which has no internal field, and
+  // Nan::ObjectWrap::Unwrap would abort. The instance carries the field.
+  Local<ObjectTemplate> proto = tpl->InstanceTemplate();
   SetProtoAccessor(proto, UTF8("x"),      GetX,      SetX,      tpl);
   SetProtoAccessor(proto, UTF8("y"),      GetY,      SetY,      tpl);
   SetProtoAccessor(proto, UTF8("width"),  GetWidth,  SetWidth,  tpl);

package/src/modules/cairo/rectangle.cc

@@ -28,8 +28,12 @@ void Rectangle::Initialize(Nan::ADDON_REGISTER_FUNCTION_ARGS_TYPE target) {
   tpl->InstanceTemplate()->SetInternalFieldCount(1);
   tpl->SetClassName(Nan::New("CairoRectangle").ToLocalChecked());
 
-  // Prototype
-  Local<ObjectTemplate> proto = tpl->PrototypeTemplate();
+  // Accessors and indexed handlers must be installed on the instance
+  // template, not the prototype: in V8 14 property callbacks expose only
+  // HolderV2() (the holder). An accessor on the prototype would hand the
+  // callback the prototype object, which has no internal field, and
+  // Nan::ObjectWrap::Unwrap would abort. The instance carries the field.
+  Local<ObjectTemplate> proto = tpl->InstanceTemplate();
   SetProtoAccessor(proto, UTF8("x"),      GetX,      SetX,      tpl);
   SetProtoAccessor(proto, UTF8("y"),      GetY,      SetY,      tpl);
   SetProtoAccessor(proto, UTF8("width"),  GetWidth,  SetWidth,  tpl);

package/src/modules/cairo/text-cluster.cc

@@ -28,8 +28,12 @@ void TextCluster::Initialize(Nan::ADDON_REGISTER_FUNCTION_ARGS_TYPE target) {
   tpl->InstanceTemplate()->SetInternalFieldCount(1);
   tpl->SetClassName(Nan::New("CairoTextCluster").ToLocalChecked());
 
-  // Prototype
-  Local<ObjectTemplate> proto = tpl->PrototypeTemplate();
+  // Accessors and indexed handlers must be installed on the instance
+  // template, not the prototype: in V8 14 property callbacks expose only
+  // HolderV2() (the holder). An accessor on the prototype would hand the
+  // callback the prototype object, which has no internal field, and
+  // Nan::ObjectWrap::Unwrap would abort. The instance carries the field.
+  Local<ObjectTemplate> proto = tpl->InstanceTemplate();
   SetProtoAccessor(proto, UTF8("length"), GetLength, NULL,  tpl);
   SetProtoAccessor(proto, UTF8("flags"),  GetFlags,  NULL,  tpl);
   Nan::SetIndexedPropertyHandler(proto, IndexGetter);

package/src/modules/cairo/text-extents.cc

@@ -28,8 +28,12 @@ void TextExtents::Initialize(Nan::ADDON_REGISTER_FUNCTION_ARGS_TYPE target) {
   tpl->InstanceTemplate()->SetInternalFieldCount(1);
   tpl->SetClassName(Nan::New("CairoTextExtents").ToLocalChecked());
 
-  // Prototype
-  Local<ObjectTemplate> proto = tpl->PrototypeTemplate();
+  // Accessors and indexed handlers must be installed on the instance
+  // template, not the prototype: in V8 14 property callbacks expose only
+  // HolderV2() (the holder). An accessor on the prototype would hand the
+  // callback the prototype object, which has no internal field, and
+  // Nan::ObjectWrap::Unwrap would abort. The instance carries the field.
+  Local<ObjectTemplate> proto = tpl->InstanceTemplate();
   SetProtoAccessor(proto, UTF8("xBearing"), GetXBearing, SetXBearing,  tpl);
   SetProtoAccessor(proto, UTF8("yBearing"), GetYBearing, SetYBearing, tpl);
   SetProtoAccessor(proto, UTF8("width"),    GetWidth,  SetWidth,  tpl);

package/src/modules/system.cc

@@ -24,7 +24,7 @@ namespace System {
 static gsize GetObjectSize (Local<Object> object) {
     // Boxed
     if (object->InternalFieldCount() == 2) {
-        auto box = static_cast<Boxed*>(object->GetAlignedPointerFromInternalField(1));
+        auto box = static_cast<Boxed*>(Nan::GetInternalFieldPointer(object, 1));
         return GetComplexTypeSize(box->info);
     }
     // GObject
@@ -38,7 +38,7 @@ static gsize GetObjectSize (Local<Object> object) {
 
 NAN_METHOD(AddressOf) {
     Local<Object> object = info[0].As<Object>();
-    void *pointer = object->GetAlignedPointerFromInternalField (0);
+    void *pointer = Nan::GetInternalFieldPointer(object, 0);
     RETURN(Nan::New<Number>((uint64_t)pointer));
 }
 
@@ -64,7 +64,7 @@ NAN_METHOD(ConvertGValue) {
         RETURN(Nan::Undefined());
         return;
     }
-    void *ptr = obj->GetAlignedPointerFromInternalField (0);
+    void *ptr = Nan::GetInternalFieldPointer(obj, 0);
     ResourceOwnership ownership = kCopy;
     RETURN(GValueToV8(reinterpret_cast<GValue *>(ptr), ownership));
 }
@@ -79,7 +79,7 @@ NAN_METHOD(GetMemoryContent) {
     }
     else {
         auto object = info[0].As<Object>();
-        address = (uint8_t *) object->GetAlignedPointerFromInternalField (0);
+        address = (uint8_t *) Nan::GetInternalFieldPointer(object, 0);
         size    = GetObjectSize(object);
     }
 

package/src/util.h

@@ -48,14 +48,14 @@ inline void SetProtoAccessor(
         Nan::SetterCallback setter,
         v8::Local<v8::FunctionTemplate> ctor
         ) {
+    // Trailing settings/attribute args are omitted so Nan supplies the right
+    // AccessControl default per V8 version (v8::DEFAULT was removed in V8 14).
     Nan::SetAccessor(
             tpl,
             name,
             getter,
             setter,
-            v8::Local<v8::Value>(),
-            v8::DEFAULT,
-            v8::None);
+            v8::Local<v8::Value>());
 }
 
 namespace Util

package/src/value.cc

@@ -6,6 +6,7 @@
 
 #include "error.h"
 #include "boxed.h"
+#include "fundamental.h"
 #include "function.h"
 #include "gi.h"
 #include "gobject.h"
@@ -51,7 +52,7 @@ static guint64 V8ToUint64 (Local<Value> value) {
 }
 
 
-Local<Value> GIArgumentToV8(GITypeInfo *type_info, GIArgument *arg, long length, ResourceOwnership ownership) {
+Local<Value> GIArgumentToV8(GITypeInfo *type_info, GIArgument *arg, long length, ResourceOwnership ownership, bool nullable) {
     GITypeTag type_tag = g_type_info_get_tag (type_info);
 
     switch (type_tag) {
@@ -120,6 +121,11 @@ Local<Value> GIArgumentToV8(GITypeInfo *type_info, GIArgument *arg, long length,
     case GI_TYPE_TAG_UTF8: {
         if (arg->v_string)
             return New<String>(arg->v_string).ToLocalChecked();
+        else if (nullable)
+            // A nullable string (e.g. g_data_input_stream_read_line_utf8_finish
+            // at EOF) returns NULL: surface it as `null` so it is
+            // distinguishable from a legitimately empty string. (#467)
+            return Nan::Null();
         else
             return Nan::EmptyString();
     }
@@ -136,7 +142,9 @@ Local<Value> GIArgumentToV8(GITypeInfo *type_info, GIArgument *arg, long length,
              * of a GObject, instead this represent the object type (eg class).  A GObject
              * has methods, fields, properties, signals, interfaces, constants and virtual functions. */
             case GI_INFO_TYPE_OBJECT:
-                if (G_IS_PARAM_SPEC(arg->v_pointer))
+                if (IsFundamentalObjectInfo(interface_info))
+                    value = WrapperFromFundamental(interface_info, arg->v_pointer, ownership);
+                else if (G_IS_PARAM_SPEC(arg->v_pointer))
                     value = ParamSpec::FromGParamSpec((GParamSpec *)arg->v_pointer);
                 else
                     value = WrapperFromGObject((GObject *)arg->v_pointer);
@@ -144,7 +152,12 @@ Local<Value> GIArgumentToV8(GITypeInfo *type_info, GIArgument *arg, long length,
             case GI_INFO_TYPE_BOXED:
             case GI_INFO_TYPE_STRUCT:
             case GI_INFO_TYPE_UNION:
-                value = WrapperFromBoxed (interface_info, arg->v_pointer, ownership);
+                // GVariant is a struct-classed fundamental: refcount it via the
+                // fundamental wrapper rather than g_boxed_copy (#465).
+                if (IsVariantInfo (interface_info))
+                    value = WrapperFromVariant (arg->v_pointer, ownership);
+                else
+                    value = WrapperFromBoxed (interface_info, arg->v_pointer, ownership);
                 break;
             case GI_INFO_TYPE_ENUM:
                 value = New<Number>(arg->v_int);
@@ -166,7 +179,7 @@ Local<Value> GIArgumentToV8(GITypeInfo *type_info, GIArgument *arg, long length,
         }
 
     case GI_TYPE_TAG_ARRAY:
-        return ArrayToV8(type_info, arg->v_pointer, length);
+        return ArrayToV8(type_info, arg->v_pointer, length, nullable);
 
     case GI_TYPE_TAG_GLIST:
         return GListToV8(type_info, (GList *)arg->v_pointer);
@@ -323,7 +336,13 @@ static bool IsZeroMemory (const void *ptr, gsize size) {
     return true;
 }
 
-Local<Value> ArrayToV8 (GITypeInfo *type_info, void* data, long length) {
+Local<Value> ArrayToV8 (GITypeInfo *type_info, void* data, long length, bool nullable) {
+
+    // A nullable array return (e.g. g_data_input_stream_read_line_finish at
+    // EOF) yields a NULL pointer: surface it as `null` so it is
+    // distinguishable from a legitimately empty array. (#467)
+    if (data == nullptr && nullable)
+        return Nan::Null();
 
     auto array = New<Array>();
 
@@ -833,6 +852,15 @@ bool V8ToGIArgumentInterface(GIBaseInfo *gi_info, GIArgument *arg, Local<Value>
             arg->v_pointer = ParamSpec::FromWrapper(value);
             break;
         }
+
+        if (IsFundamentalObjectInfo(gi_info)) {
+            // A fundamental (non-GObject) instance such as GskRenderNode: take
+            // the raw wrapped pointer. GObjectFromWrapper would G_OBJECT()-cast
+            // it — silently on Linux (cast checks compiled out) but a fatal
+            // `invalid cast ... to GObject` under G_DEBUG on Windows (#468).
+            arg->v_pointer = PointerFromWrapper(value);
+            break;
+        }
         // fallthrough
     }
     case GI_INFO_TYPE_INTERFACE:
@@ -1726,7 +1754,7 @@ bool CanConvertV8ToGValue(GValue *gvalue, Local<Value> value) {
     } else if (G_VALUE_HOLDS_POINTER (gvalue)) {
         return false;
     } else if (G_VALUE_HOLDS_VARIANT (gvalue)) {
-        return false;
+        return value->IsNullOrUndefined() || ValueIsInstanceOfGType(value, G_TYPE_VARIANT);
     }
 
     ERROR("Unhandled GValue type: %s (please report this)",
@@ -1819,7 +1847,13 @@ bool V8ToGValue(GValue *gvalue, Local<Value> value, ResourceOwnership ownership)
     } else if (G_VALUE_HOLDS_POINTER (gvalue)) {
         ERROR("Unsupported type: pointer");
     } else if (G_VALUE_HOLDS_VARIANT (gvalue)) {
-        ERROR("Unsupported type: variant");
+        // GVariant is nullable. g_value_set_variant refs a non-NULL variant
+        // (and sinks a floating one), so the GValue holds its own reference
+        // independent of the JS wrapper (#465).
+        g_value_set_variant (gvalue,
+                value->IsNullOrUndefined()
+                    ? NULL
+                    : (GVariant *) PointerFromWrapper (value));
     } else {
         ERROR("Unhandled GValue type: %s (please report this)",
                 g_type_name(G_VALUE_TYPE(gvalue)));
@@ -1896,7 +1930,9 @@ Local<Value> GValueToV8(const GValue *gvalue, ResourceOwnership ownership) {
     } else if (G_VALUE_HOLDS_POINTER (gvalue)) {
         ERROR("Unsuported type: pointer");
     } else if (G_VALUE_HOLDS_VARIANT (gvalue)) {
-        ERROR("Unsuported type: variant");
+        // GVariant is a struct-classed fundamental; the fundamental wrapper
+        // takes its own reference according to `ownership` (#465).
+        return WrapperFromVariant (g_value_get_variant (gvalue), ownership);
     } else {
         // Don't abort the whole process on a GValue type we can't convert
         // (e.g. GStreamer's GstValueArray / GstValueList, #389). Warn and

package/src/value.h

@@ -20,9 +20,9 @@ enum ResourceOwnership {
 Local<Value> GListToV8  (GITypeInfo *info, GList  *glist);
 Local<Value> GSListToV8 (GITypeInfo *info, GSList *glist);
 Local<Value> GHashToV8 (GITypeInfo *info, GHashTable *hash);
-Local<Value> ArrayToV8  (GITypeInfo *info, gpointer data, long length = -1);
+Local<Value> ArrayToV8  (GITypeInfo *info, gpointer data, long length = -1, bool nullable = false);
 Local<Value> GErrorToV8 (GITypeInfo *type_info, GError *err, ResourceOwnership ownership = kNone);
-Local<Value> GIArgumentToV8 (GITypeInfo *type_info, GIArgument *argument, long length = -1, ResourceOwnership ownership = kNone);
+Local<Value> GIArgumentToV8 (GITypeInfo *type_info, GIArgument *argument, long length = -1, ResourceOwnership ownership = kNone, bool nullable = false);
 long         GIArgumentToLength(GITypeInfo *type_info, GIArgument *arg, bool is_pointer);
 
 bool         V8ToGIArgumentInterface (GIBaseInfo *gi_info, GIArgument *argument, Local<Value> value);