@gjsify/node-gi 0.52.0 → 0.53.0

package/src/loop.cc

@@ -379,8 +379,9 @@ Napi::Value IterateMainContext(const Napi::CallbackInfo& info) {
 struct PumpPoll {
   uv_poll_t handle;
   int fd;
-  int events;     // currently-subscribed uv event mask
-  gboolean seen;  // mark/sweep flag for SyncPumpPolls
+  int events;        // currently-subscribed uv event mask
+  gboolean seen;     // mark/sweep flag for SyncPumpPolls
+  gboolean started;  // whether the watcher is currently armed (see PumpPollCb)
 };
 
 static gboolean g_pump_inited = FALSE;
@@ -398,7 +399,26 @@ static gboolean g_pump_poll_warned = FALSE;
 // Wake-only callbacks: readiness/expiry just ends libuv's poll sleep; the actual
 // GLib dispatch happens in the check phase of the same loop turn (PumpCheckCb).
 static void PumpTimerCb(uv_timer_t* /*t*/) {}
-static void PumpPollCb(uv_poll_t* /*p*/, int /*status*/, int /*events*/) {}
+
+// A wake-up is an EDGE, so the watcher DISARMS itself on the first fire and
+// PumpArmWakeups re-arms it on the next libuv turn. uv_poll is level-triggered
+// and this callback reads nothing, so a GLib fd that stays ready — a dead D-Bus
+// socket stuck at POLLHUP, or the context's own wakeup eventfd, which
+// `block_source()` re-signals on every dispatch — leaves uv's backend fd
+// PERPETUALLY readable. That fd is embedded in UvLoopSource, so GLib then reads
+// "Node has work" on every prepare, and any foreign drain loop of the shape
+// `while (g_main_context_iteration(ctx, FALSE));` never terminates: measured in
+// `e_source_registry_new_sync`'s failure path (no D-Bus reachable), 6.9 M
+// dispatches in 20 s at 100 % CPU with `uv_backend_timeout()` sitting at ~4.6 s,
+// i.e. never once because Node actually had work. The pump's own drain would
+// have cleared the GLib side, but it no-ops at `g_main_depth() > 0` — exactly
+// where a foreign nested iteration runs. Regression
+// `test/foreign-context-drain.test.mjs`.
+static void PumpPollCb(uv_poll_t* p, int /*status*/, int /*events*/) {
+  PumpPoll* pp = reinterpret_cast<PumpPoll*>(p->data);
+  uv_poll_stop(p);
+  pp->started = FALSE;
+}
 
 static void PumpPollCloseCb(uv_handle_t* h) {
   delete reinterpret_cast<PumpPoll*>(h->data);
@@ -440,9 +460,12 @@ static gboolean SyncPumpPolls(int nfds) {
     if (it != g_pump_polls->end()) {
       PumpPoll* pp = it->second;
       pp->seen = TRUE;
-      if (pp->events != ev) {
+      // Re-arm a watcher that disarmed itself on its last fire, as well as one
+      // whose event mask changed.
+      if (pp->events != ev || !pp->started) {
         if (uv_poll_start(&pp->handle, ev, PumpPollCb) == 0) {
           pp->events = ev;
+          pp->started = TRUE;
           uv_unref(reinterpret_cast<uv_handle_t*>(&pp->handle));
         } else {
           all_ok = FALSE;
@@ -466,6 +489,7 @@ static gboolean SyncPumpPolls(int nfds) {
       all_ok = FALSE;
       continue;
     }
+    pp->started = TRUE;
     uv_unref(reinterpret_cast<uv_handle_t*>(&pp->handle));
     (*g_pump_polls)[fd] = pp;
   }

package/src/marshal.cc

@@ -4,6 +4,7 @@
 #include "common.h"
 
 #include <cmath>
+#include <cstring>
 #include <unordered_map>
 #include <utility>
 
@@ -789,7 +790,7 @@ bool JsToGIArgument(Napi::Env env, Napi::Value v, GITypeInfo* type, GIArgument*
       // how an application POSTS the failure the bus accessors read back —
       // `GLib.propagate_error`, and the INOUT `err` of `GLib.prefix_error_literal`.
       // null/undefined → a NULL GError, the same leniency the object/boxed arms
-      // keep (gjs refuses both for a non-nullable arg — status/open-todos.md).
+      // keep (gjs refuses both for a non-nullable arg — status/open-todos/README.md).
       if (v.IsNull() || v.IsUndefined()) {
         out->v_pointer = nullptr;
         return true;
@@ -1040,8 +1041,15 @@ Napi::Value GIArgumentToJs(Napi::Env env, GITypeInfo* type, GIArgument* arg,
 // unchanged, which is right for a pointer-struct element and meaningless for a
 // four-byte enum or a twenty-four-byte record. So the by-value admission is scoped to
 // the one container kind that has somewhere to put the bytes.
-static bool IsSupportedElementType(GITypeInfo* elem, std::string* why, bool byValueOk) {
-  switch (gi_type_info_get_tag(elem)) {
+//
+// `cArrayCell` is true for a C array in EITHER direction: its elements are sized
+// cells the IN path writes and ReadCElement reads. A GType element is admitted only
+// there — a list/hash node would carry it through the hash-pointer helpers, which
+// this file has never exercised for that tag.
+static bool IsSupportedElementType(GITypeInfo* elem, std::string* why, bool byValueOk,
+                                   bool cArrayCell) {
+  GITypeTag tag = gi_type_info_get_tag(elem);
+  switch (tag) {
     case GI_TYPE_TAG_BOOLEAN:
     case GI_TYPE_TAG_INT8:
     case GI_TYPE_TAG_UINT8:
@@ -1096,8 +1104,21 @@ static bool IsSupportedElementType(GITypeInfo* elem, std::string* why, bool byVa
       if (iface != nullptr) gi_base_info_unref(iface);
       return ok;
     }
+    // `GdaConnection.statement_execute_select_full`'s `col_types` is the call that
+    // needed it (@gjsify/sqlite reads 64-bit integers exactly by typing columns). It
+    // fell to the default below and was refused as a "nested-container element".
+    case GI_TYPE_TAG_GTYPE:
+      if (!cArrayCell && why != nullptr) *why = "GType element outside a C array";
+      return cArrayCell;
     default:
-      if (why != nullptr) *why = "nested-container element";
+      // Name the tag: this label used to be "nested-container element" for EVERY
+      // unhandled tag, which sent the GType case above looking for a nested container.
+      if (why != nullptr) {
+        bool nested = tag == GI_TYPE_TAG_ARRAY || tag == GI_TYPE_TAG_GLIST ||
+                      tag == GI_TYPE_TAG_GSLIST || tag == GI_TYPE_TAG_GHASH;
+        *why = nested ? "nested-container element"
+                      : std::string(gi_type_tag_to_string(tag)) + " element";
+      }
       return false;
   }
 }
@@ -1121,10 +1142,10 @@ bool IsSupportedContainerType(GITypeInfo* type, std::string* why, ContainerUse u
       // GArray is deliberately excluded alongside the lists: its elements are sized,
       // but g_array_append_vals copies from a buffer this path would have to size the
       // same way, and no installed typelib has a by-value-element GArray as IN.
-      bool byValueOk = use == ContainerUse::kIn &&
-                       gi_type_info_get_tag(type) == GI_TYPE_TAG_ARRAY &&
-                       gi_type_info_get_array_type(type) == GI_ARRAY_TYPE_C;
-      bool ok = IsSupportedElementType(elem, why, byValueOk);
+      bool cArray = gi_type_info_get_tag(type) == GI_TYPE_TAG_ARRAY &&
+                    gi_type_info_get_array_type(type) == GI_ARRAY_TYPE_C;
+      bool byValueOk = use == ContainerUse::kIn && cArray;
+      bool ok = IsSupportedElementType(elem, why, byValueOk, cArray);
       gi_base_info_unref(elem);
       return ok;
     }
@@ -1139,7 +1160,7 @@ bool IsSupportedContainerType(GITypeInfo* type, std::string* why, ContainerUse u
                  ktag == GI_TYPE_TAG_INT8 || ktag == GI_TYPE_TAG_UINT8 ||
                  ktag == GI_TYPE_TAG_INT16 || ktag == GI_TYPE_TAG_UINT16 ||
                  ktag == GI_TYPE_TAG_INT32 || ktag == GI_TYPE_TAG_UINT32;
-      bool vok = vt != nullptr && IsSupportedElementType(vt, nullptr, false);
+      bool vok = vt != nullptr && IsSupportedElementType(vt, nullptr, false, false);
       if (!kok && why != nullptr) *why = "unsupported GHashTable key";
       else if (!vok && why != nullptr) *why = "unsupported GHashTable value";
       if (kt != nullptr) gi_base_info_unref(kt);
@@ -1166,6 +1187,7 @@ size_t CElementSize(GITypeInfo* elem) {
     case GI_TYPE_TAG_UINT64: return 8;
     case GI_TYPE_TAG_FLOAT: return sizeof(gfloat);
     case GI_TYPE_TAG_DOUBLE: return sizeof(gdouble);
+    case GI_TYPE_TAG_GTYPE: return sizeof(GType);
     case GI_TYPE_TAG_UTF8:
     case GI_TYPE_TAG_FILENAME:
     case GI_TYPE_TAG_INTERFACE: return sizeof(gpointer);
@@ -1329,6 +1351,7 @@ static Napi::Value ReadCElement(Napi::Env env, GITypeInfo* elem, const void* src
     case GI_TYPE_TAG_UINT64: a.v_uint64 = *static_cast<const guint64*>(src); break;
     case GI_TYPE_TAG_FLOAT: a.v_float = *static_cast<const gfloat*>(src); break;
     case GI_TYPE_TAG_DOUBLE: a.v_double = *static_cast<const gdouble*>(src); break;
+    case GI_TYPE_TAG_GTYPE: a.v_size = *static_cast<const GType*>(src); break;
     case GI_TYPE_TAG_UTF8:
     case GI_TYPE_TAG_FILENAME: a.v_string = *static_cast<char* const*>(src); break;
     case GI_TYPE_TAG_INTERFACE: a.v_pointer = *static_cast<gpointer const*>(src); break;
@@ -1599,6 +1622,20 @@ static bool ElementToGIArgument(Napi::Env env, GITypeInfo* elem, Napi::Value v,
     case GI_TYPE_TAG_UINT64: a->v_uint64 = JsValueToUint64(v); return true;
     case GI_TYPE_TAG_FLOAT: a->v_float = static_cast<gfloat>(NodeGiToDouble(v)); return true;
     case GI_TYPE_TAG_DOUBLE: a->v_double = NodeGiToDouble(v); return true;
+    case GI_TYPE_TAG_GTYPE: {
+      // Stricter than a scalar GType argument, as gjs is (`test_array_gtype_in
+      // ([undefined])` throws): a null element would become G_TYPE_INVALID, which in
+      // a zero-terminated array silently truncates everything after it.
+      if (v.IsNull() || v.IsUndefined()) {
+        Napi::TypeError::New(env, "expected a GType handle (e.g. Class.$gtype) as an array element")
+            .ThrowAsJavaScriptException();
+        return false;
+      }
+      GType gt = 0;
+      if (!UnwrapGTypeArg(env, v, &gt)) return false;
+      a->v_size = static_cast<gsize>(gt);
+      return true;
+    }
     case GI_TYPE_TAG_UTF8:
     case GI_TYPE_TAG_FILENAME:
       a->v_string = (v.IsEmpty() || v.IsNull() || v.IsUndefined())
@@ -1679,6 +1716,330 @@ static size_t BoxedInfoSize(GIBaseInfo* info) {
   return 0;
 }
 
+static bool ByValueRecordToCell(Napi::Env env, GITypeInfo* elem, Napi::Value v, void* dst,
+                                size_t elemSize, gpointer* writeBackTo);
+static bool JsToCArray(Napi::Env env, Napi::Value v, GITypeInfo* type, GITransfer transfer,
+                       gpointer* outPtr, long* outCount, std::vector<gpointer>* writeBack);
+
+// ---- a call C makes INTO JS: OUT / INOUT parameters and the answer ---------
+//
+// C calls a JS `vfunc_*` override or a GI callback with a POINTER for each OUT/INOUT
+// parameter and reads the answer back through it. Both trampolines used to hand those
+// pointers to JS as if they were IN values and never wrote anything back, so every
+// override with an OUT parameter answered zeros: `Gtk.LayoutManager.vfunc_measure`
+// returned `[min, nat, minBaseline, natBaseline]` from JS and GTK read `0, 0, 0, 0`.
+// That is what left a React Native `<ScrollView horizontal>` rail zero-height under
+// node-gi while the same code measured correctly on gjs. One class serves both
+// trampolines so the two cannot answer in different shapes.
+//
+// The shape is gjs's (gi/function.cpp callback_closure_inner): a pure OUT is not a
+// JS argument, an INOUT passes its current value, a `void`-typed OUT is skipped
+// entirely; one output (the return, or a lone OUT) is the JS return value itself,
+// several are an array — the return first, then the OUT/INOUT in declaration order.
+//
+// OWNERSHIP follows the parameter's transfer, through the same JsToGIArgument the IN
+// path uses: on EVERYTHING the C caller adopts the value, so an object gets its own
+// ref and a boxed its own copy; on NOTHING it borrows the wrapper's. Only the slot's
+// own bytes are copied out of the union (CInElementSize), never all eight, because the
+// destination is the caller's `int`/`gboolean`/enum variable and not a GIArgument.
+
+namespace {
+
+// How many bytes one scalar-shaped OUT/INOUT slot's variable holds, or 0 when it is
+// not one: a by-value record not marked caller-allocates, a GType and the containers
+// have no element write here (a self-delimiting OUT array has its own, in WriteOut),
+// and are refused with the parameter's name rather than half-written.
+size_t OutSlotSize(GITypeInfo* ti) {
+  if (IsByValueRecordElement(ti)) return 0;
+  size_t size = CInElementSize(ti);
+  return size <= sizeof(GIArgument) ? size : 0;
+}
+
+// How many bytes to zero in an unanswered pure OUT: its scalar size, or one pointer
+// for a container, whose variable is the pointer the caller would free.
+size_t OutZeroSize(GITypeInfo* ti) {
+  switch (gi_type_info_get_tag(ti)) {
+    case GI_TYPE_TAG_ARRAY:
+    case GI_TYPE_TAG_GLIST:
+    case GI_TYPE_TAG_GSLIST:
+    case GI_TYPE_TAG_GHASH:
+    case GI_TYPE_TAG_ERROR: return sizeof(gpointer);
+    case GI_TYPE_TAG_GTYPE: return sizeof(GType);
+    default: return OutSlotSize(ti);
+  }
+}
+
+// GObject qdata quark for the GPtrArray of transfer-none string answers tied to an
+// object's lifetime (AssociateStringWithObject below). A function-local static is
+// safe here — g_quark_from_static_string is idempotent and already how this file's
+// other qdata keys are declared (see class.cc's NodeGiClassDataQuark).
+static GQuark NodeGiInstanceStringsQuark() {
+  static GQuark q = g_quark_from_static_string("node-gi-instance-strings");
+  return q;
+}
+
+// Record `str` (already g_strdup'd) to be freed when `obj` is finalized. Mirrors
+// gjs's ObjectInstance::associate_string (refs/gjs/gi/object.cpp): a GPtrArray hung
+// off the object's own qdata, created on first use and freed automatically by
+// g_object_set_qdata_full's destroy notify.
+static void AssociateStringWithObject(GObject* obj, char* str) {
+  auto* strings = static_cast<GPtrArray*>(g_object_get_qdata(obj, NodeGiInstanceStringsQuark()));
+  if (strings == nullptr) {
+    strings = g_ptr_array_new_with_free_func(g_free);
+    g_object_set_qdata_full(obj, NodeGiInstanceStringsQuark(), strings,
+                            reinterpret_cast<GDestroyNotify>(g_ptr_array_unref));
+  }
+  g_ptr_array_add(strings, str);
+}
+
+// A string C keeps. A transfer-full one is C's to free, so it gets its own copy. A
+// transfer-none one must outlive this frame with NOBODY freeing it — a JsToGIArgument
+// string would point into a std::string that dies here.
+//
+// `owner` (the vfunc's instance, when there is one) gets first refusal: tying the
+// string to ITS lifetime bounds the cost to that object's lifetime, exactly as gjs
+// does. Without an owner (a plain GI callback has none) g_intern_string is the only
+// option — valid forever, one copy per distinct value — and that IS gjs's own
+// fallback there too. Interning unconditionally (this file's previous approach) is
+// the wrong default for the common vfunc case: a JS override that answers a FRESH
+// transfer-none string every call (e.g. Gtk.Editable's vfunc_get_text on a
+// live-updating buffer) would intern one string PER CALL, forever, for the life of
+// the process — unbounded growth a real widget hits on every keystroke.
+char* StringForC(Napi::Value v, GITransfer transfer, GObject* owner) {
+  if (!v.IsString()) return nullptr;
+  std::string s = v.As<Napi::String>().Utf8Value();
+  if (transfer != GI_TRANSFER_NOTHING) return g_strdup(s.c_str());
+  if (owner != nullptr) {
+    char* dup = g_strdup(s.c_str());
+    AssociateStringWithObject(owner, dup);
+    return dup;
+  }
+  return const_cast<char*>(g_intern_string(s.c_str()));
+}
+
+bool JsToAnswerArgument(Napi::Env env, Napi::Value v, GITypeInfo* ti, GITransfer transfer,
+                        GIArgument* out, const char* argName, GObject* owner) {
+  memset(out, 0, sizeof(*out));
+  GITypeTag tag = gi_type_info_get_tag(ti);
+  if (tag == GI_TYPE_TAG_UTF8 || tag == GI_TYPE_TAG_FILENAME) {
+    out->v_string = StringForC(v, transfer, owner);
+    return true;
+  }
+  std::string held;
+  return JsToGIArgument(env, v, ti, out, &held, transfer, nullptr, nullptr, nullptr, nullptr,
+                        nullptr, argName);
+}
+
+}  // namespace
+
+CToJsCall::CToJsCall(Napi::Env env, GICallableInfo* ci, std::string label, GObject* owner)
+    : env_(env), ci_(ci), label_(std::move(label)), owner_(owner) {}
+
+CToJsCall::~CToJsCall() {
+  for (const Slot& s : outs_) {
+    gi_base_info_unref(s.ti);
+    gi_base_info_unref(s.ai);
+  }
+}
+
+void CToJsCall::ThrowUnsupported(const Slot& s) const {
+  Napi::TypeError::New(env_, label_ + ": OUT/INOUT parameter '" +
+                                 gi_base_info_get_name(reinterpret_cast<GIBaseInfo*>(s.ai)) +
+                                 "' has a type node-gi cannot write back from JS")
+      .ThrowAsJavaScriptException();
+}
+
+bool CToJsCall::MarshalArgs(void** args, unsigned int offset, std::vector<napi_value>* jsArgs) {
+  unsigned int n = gi_callable_info_get_n_args(ci_);
+  jsArgs->reserve(n);
+  // Every arg's C value, indexed like the callable's args, so a length-annotated
+  // C-array arg can read its companion length (ReadOutOrReturn's `slots`). Without
+  // it such an array is not zero-terminated and reads as EMPTY — measured: a JS
+  // Gio.OutputStream's vfunc_write_fn(buffer) got [] and returned 0 where gjs
+  // 1.88.1 hands it all 3 bytes, a silent short write (write_all would spin).
+  // An ffi slot holds the value at its own width; OutSlotSize is that width for a
+  // scalar and 0 for anything that can never be a length.
+  // `isLength` marks those companions: gjs never hands one to JS (the array carries
+  // its length), so the handler's later args keep their gjs positions —
+  // vfunc_write_fn(buffer, cancellable), not (buffer, count, cancellable).
+  std::vector<GIArgument> slots(n);
+  std::vector<bool> isLength(n, false);
+  for (unsigned int i = 0; i < n; i++) {
+    GIArgInfo* ai = gi_callable_info_get_arg(ci_, i);
+    GITypeInfo* ti = gi_arg_info_get_type_info(ai);
+    GIDirection dir = gi_arg_info_get_direction(ai);
+    unsigned int lenIdx = 0;
+    if (gi_type_info_get_tag(ti) == GI_TYPE_TAG_ARRAY &&
+        gi_type_info_get_array_length_index(ti, &lenIdx) && lenIdx < n)
+      isLength[lenIdx] = true;
+    size_t size = gi_type_info_get_tag(ti) == GI_TYPE_TAG_VOID ? 0 : OutSlotSize(ti);
+    void* src = args[i + offset];
+    if (dir == GI_DIRECTION_INOUT && src != nullptr && !gi_arg_info_is_caller_allocates(ai))
+      src = static_cast<GIArgument*>(src)->v_pointer;
+    else if (dir == GI_DIRECTION_OUT)
+      src = nullptr;
+    if (src != nullptr && size > 0) memcpy(&slots[i], src, size);
+    gi_base_info_unref(ti);
+    gi_base_info_unref(ai);
+  }
+  // After a failed conversion the loop keeps going, recording only the OUT slots, so
+  // WriteAnswer can still zero every one of them — JS will not run to answer.
+  bool failed = false;
+  for (unsigned int i = 0; i < n; i++) {
+    GIArgInfo* ai = gi_callable_info_get_arg(ci_, i);
+    GITypeInfo* ti = gi_arg_info_get_type_info(ai);
+    GIArgument* ffiSlot = static_cast<GIArgument*>(args[i + offset]);
+    GIDirection dir = gi_arg_info_get_direction(ai);
+    if (dir == GI_DIRECTION_IN || gi_type_info_get_tag(ti) == GI_TYPE_TAG_VOID) {
+      if (dir == GI_DIRECTION_IN && !failed && !isLength[i]) {
+        // ReadOutOrReturn, not GIArgumentToJs directly: a C-invoked callback's
+        // IN argument can be a container too (Soup.ServerCallback's trailing
+        // `query` is a GHashTable, GI_TYPE_TAG_GHASH) — GIArgumentToJs's switch
+        // has no ARRAY/GLIST/GSLIST/GHASH arm and threw "Unsupported return
+        // type tag 19" on EVERY invocation, aborting the callback (and, for a
+        // scope=call libsoup request handler, the connection) before the JS
+        // side ever ran. `slots` resolves a length-annotated C array (above).
+        Napi::Value v = ReadOutOrReturn(env_, ci_, ti, ffiSlot, GI_TRANSFER_NOTHING, &slots);
+        failed = env_.IsExceptionPending();
+        if (!failed) jsArgs->push_back(v);
+      }
+      gi_base_info_unref(ti);
+      gi_base_info_unref(ai);
+      continue;
+    }
+    // The ffi slot of an OUT/INOUT holds the caller's pointer: to its variable, or for
+    // a caller-allocates record to the record itself.
+    outs_.push_back({ai, ti, ffiSlot->v_pointer});
+    if (dir != GI_DIRECTION_INOUT || failed) continue;
+    const Slot& s = outs_.back();
+    GIArgument cur;
+    memset(&cur, 0, sizeof(cur));
+    if (s.dest == nullptr) {
+      jsArgs->push_back(env_.Null());
+      continue;
+    }
+    if (gi_arg_info_is_caller_allocates(ai)) {
+      cur.v_pointer = s.dest;
+    } else {
+      size_t size = OutSlotSize(ti);
+      if (size == 0) {
+        ThrowUnsupported(s);
+        failed = true;
+        continue;
+      }
+      memcpy(&cur, s.dest, size);
+    }
+    // Same container gap as the IN-arg read above (an INOUT container arg is
+    // rarer, but the fix is identical): ReadOutOrReturn, not GIArgumentToJs.
+    Napi::Value v = ReadOutOrReturn(env_, ci_, ti, &cur, GI_TRANSFER_NOTHING, &slots);
+    failed = env_.IsExceptionPending();
+    if (!failed) jsArgs->push_back(v);
+  }
+  return !failed;
+}
+
+bool CToJsCall::WriteOut(const Slot& s, Napi::Value v) {
+  // A nullable OUT the caller passed NULL for: it did not ask, so there is nothing to
+  // write and nothing to refuse.
+  if (s.dest == nullptr) return true;
+  const char* name = gi_base_info_get_name(reinterpret_cast<GIBaseInfo*>(s.ai));
+  if (gi_arg_info_is_caller_allocates(s.ai)) {
+    // The caller owns the storage and wants the record's BYTES in it. The by-value
+    // array-cell writer already does exactly that and checks the handle is the SAME
+    // record type first — copying the destination's size out of a smaller handle of
+    // another type would read past its end. A GValue is initialised and deep-copied
+    // rather than aliased, which is also gjs's one caller-allocates case here.
+    GIBaseInfo* iface = gi_type_info_get_tag(s.ti) == GI_TYPE_TAG_INTERFACE
+                            ? gi_type_info_get_interface(s.ti)
+                            : nullptr;
+    size_t size = BoxedInfoSize(iface);
+    if (iface != nullptr) gi_base_info_unref(iface);
+    if (size == 0) {
+      ThrowUnsupported(s);
+      return false;
+    }
+    return ByValueRecordToCell(env_, s.ti, v, s.dest, size, nullptr);
+  }
+  GITransfer transfer = gi_arg_info_get_ownership_transfer(s.ai);
+  unsigned int lengthIndex = 0;
+  if (gi_type_info_get_tag(s.ti) == GI_TYPE_TAG_ARRAY &&
+      !gi_type_info_get_array_length_index(s.ti, &lengthIndex)) {
+    // A self-delimiting array (zero-terminated, fixed-size, or a GArray/GPtrArray/
+    // GByteArray) is one pointer the caller reads, built the way an IN array is. One
+    // with a separate length parameter is refused below: that length is a second OUT
+    // gjs would expect in the answer too, and writing it from the array is its own
+    // decision, not a side effect of this one.
+    gpointer arr = nullptr;
+    long count = 0;
+    if (!JsToCArray(env_, v, s.ti, transfer, &arr, &count, nullptr)) return false;
+    *static_cast<gpointer*>(s.dest) = arr;
+    return true;
+  }
+  size_t size = OutSlotSize(s.ti);
+  if (size == 0) {
+    ThrowUnsupported(s);
+    return false;
+  }
+  GIArgument a;
+  if (!JsToAnswerArgument(env_, v, s.ti, transfer, &a, name, owner_)) return false;
+  memcpy(s.dest, &a, size);
+  return true;
+}
+
+void CToJsCall::WriteAnswer(napi_value ret, void* result) {
+  GITypeInfo* retType = gi_callable_info_get_return_type(ci_);
+  GITypeTag rtag = gi_type_info_get_tag(retType);
+  bool hasRet = rtag != GI_TYPE_TAG_VOID;
+  size_t nAnswers = outs_.size() + (hasRet ? 1 : 0);
+  size_t written = 0;
+  if (nAnswers > 0 && ret != nullptr && !env_.IsExceptionPending()) {
+    Napi::Value rv(env_, ret);
+    std::vector<Napi::Value> answers;
+    if (nAnswers == 1) {
+      answers.push_back(rv);
+    } else if (rv.IsArray() && rv.As<Napi::Array>().Length() == nAnswers) {
+      Napi::Array arr = rv.As<Napi::Array>();
+      for (uint32_t k = 0; k < nAnswers && !env_.IsExceptionPending(); k++)
+        answers.push_back(arr.Get(k));
+    } else {
+      Napi::TypeError::New(env_, label_ + " must return an array of " +
+                                     std::to_string(nAnswers) +
+                                     " values (its return value and OUT parameters)")
+          .ThrowAsJavaScriptException();
+    }
+    if (answers.size() == nAnswers && !env_.IsExceptionPending()) {
+      size_t k = 0;
+      bool ok = true;
+      if (hasRet) {
+        GIArgument a;
+        ok = JsToAnswerArgument(env_, answers[k++], retType,
+                                gi_callable_info_get_caller_owns(ci_), &a, "return value",
+                                owner_);
+        // The ffi return slot is at least ffi_arg wide and was zeroed by the caller,
+        // so the whole union can go in: libffi reads the low bytes it needs.
+        if (ok && result != nullptr) *static_cast<GIArgument*>(result) = a;
+      }
+      while (ok && written < outs_.size()) {
+        ok = WriteOut(outs_[written], answers[k++]);
+        if (ok) written++;
+      }
+    }
+  }
+  // Whatever was not answered — JS threw, returned the wrong shape, or a value did
+  // not convert — must not leave C reading an uninitialised variable: a pure OUT is
+  // one the caller need not have initialised. Zero it (the return slot already is);
+  // the JS exception stays pending for the trampoline to surface or propagate.
+  for (size_t i = written; i < outs_.size(); i++) {
+    const Slot& s = outs_[i];
+    if (s.dest == nullptr || gi_arg_info_get_direction(s.ai) != GI_DIRECTION_OUT ||
+        gi_arg_info_is_caller_allocates(s.ai))
+      continue;
+    size_t size = OutZeroSize(s.ti);
+    if (size != 0) memset(s.dest, 0, size);
+  }
+  gi_base_info_unref(retType);
+}
+
 // Write ONE by-value record element straight into its C-array cell.
 //
 // WHY THIS IS NOT A GIArgument, which is the whole reason the function exists. The
@@ -2381,6 +2742,7 @@ static bool ElementsAreReadable(GITypeInfo* type) {
     case GI_TYPE_TAG_UINT64:
     case GI_TYPE_TAG_FLOAT:
     case GI_TYPE_TAG_DOUBLE:
+    case GI_TYPE_TAG_GTYPE:
     case GI_TYPE_TAG_UTF8:
     case GI_TYPE_TAG_FILENAME:
       readable = true;