@nativescript/windows 0.1.0-alpha.52 → 0.1.0-alpha.54

package/framework/dotnet-bridge/BinaryProtocol.cs

@@ -10,6 +10,13 @@ internal readonly struct HandleRef(int id)
     public readonly int Id = id;
 }
 
+// Carries a raw IUnknown/IInspectable pointer from a WinRT proxy (tag 0x0A).
+// CoerceBin calls Marshal.GetObjectForIUnknown to create a managed RCW.
+internal readonly struct WinRtRef(long ptr)
+{
+    public readonly long Ptr = ptr;
+}
+
 internal ref struct BinReader(ReadOnlySpan<byte> buf)
 {
     private readonly ReadOnlySpan<byte> _buf = buf;
@@ -24,6 +31,13 @@ internal ref struct BinReader(ReadOnlySpan<byte> buf)
         return v;
     }
 
+    public long ReadI64()
+    {
+        var v = BinaryPrimitives.ReadInt64LittleEndian(_buf[_pos..]);
+        _pos += 8;
+        return v;
+    }
+
     public ushort ReadU16()
     {
         var v = BinaryPrimitives.ReadUInt16LittleEndian(_buf[_pos..]);
@@ -65,6 +79,7 @@ internal ref struct BinReader(ReadOnlySpan<byte> buf)
                 0x04 => (object)ReadF64(),
                 0x05 => (object)ReadString16(),
                 0x06 => (object)new HandleRef(ReadI32()),
+                0x0A => (object)new WinRtRef(ReadI64()),
                 _    => null,
             };
         }
@@ -100,6 +115,12 @@ internal ref struct BinWriter(ArrayBufferWriter<byte> buf)
         _buf.Advance(4);
     }
 
+    public void WriteI64(long v)
+    {
+        BinaryPrimitives.WriteInt64LittleEndian(_buf.GetSpan(8), v);
+        _buf.Advance(8);
+    }
+
     public void WriteF64(double v)
     {
         BinaryPrimitives.WriteDoubleLittleEndian(_buf.GetSpan(8), v);

package/framework/dotnet-bridge/Bridge.BinaryDispatch.cs

@@ -158,6 +158,24 @@ public static partial class Bridge
             s_handles.TryGetValue(hr.Id, out var obj);
             return obj;
         }
+        if (value is WinRtRef wr)
+        {
+            if (wr.Ptr == 0) return null;
+            var nativePtr = new IntPtr((long)wr.Ptr);
+            // 1. Typed QI first: works for COM/CsWinRT interface types that carry a
+            //    [Guid] attribute.  More precise than a generic RCW for strongly-typed
+            //    parameters such as Windows.UI.Xaml.UIElement.
+            if (targetType != typeof(object) && targetType.GUID != Guid.Empty)
+            {
+                try { return Marshal.GetTypedObjectForIUnknown(nativePtr, targetType); }
+                catch { }
+            }
+            // 2. Generic RCW: .NET WinRT interop calls IInspectable::GetRuntimeClassName
+            //    and projects to the appropriate CsWinRT type automatically.
+            //    Do NOT swallow the exception — a null return silently breaks the call
+            //    downstream; a thrown exception surfaces a meaningful error instead.
+            return Marshal.GetObjectForIUnknown(nativePtr);
+        }
         if (value.GetType() == targetType) return value;
         try { return Convert.ChangeType(value, targetType); }
         catch { return value; }

package/framework/dotnet-bridge/Bridge.Dispatch.cs

@@ -86,8 +86,6 @@ public static partial class Bridge
         finally { if (builtArgs.Length > 0) ReturnArgs(builtArgs); }
     }
 
-    // ── compiled dispatch cache ───────────────────────────────────────────────
-
     private static DispatchEntry GetCachedMethod(Type type, string name, int argCount, BindingFlags flags)
         => s_methodCache.GetOrAdd(
             new MethodKey(type, name, argCount, flags),
@@ -148,8 +146,6 @@ public static partial class Bridge
             new PropKey(type, method[prefixLen..], flags),
             static k => k.Type.GetProperty(k.Name, k.Flags));
 
-    // ── argument coercion ─────────────────────────────────────────────────────
-
     // Pooled: rented array passed to the compiled delegate (which accesses by index,
     // not by Length). Caller must return via ReturnArgs immediately after invoke.
     private static object?[] BuildArgs(JsonElement[] elements, ParameterInfo[] parameters)
@@ -186,8 +182,6 @@ public static partial class Bridge
         return el.Deserialize(targetType, s_coerceOpts);
     }
 
-    // ── async unwrapping ──────────────────────────────────────────────────────
-
     private static object? AwaitIfTask(object? value)
     {
         if (value is null) return null;
@@ -216,8 +210,6 @@ public static partial class Bridge
         return value;
     }
 
-    // ── result boxing ─────────────────────────────────────────────────────────
-
     private static DispatchResult Box(object? value)
     {
         if (value is null) return DispatchResult.Void;
@@ -239,8 +231,6 @@ public static partial class Bridge
         return DispatchResult.Handle(id, t.FullName ?? t.Name);
     }
 
-    // ── type/member resolution ────────────────────────────────────────────────
-
     internal static DispatchResult BuildMembersResult(Type t)
     {
         const BindingFlags inst = BindingFlags.Public | BindingFlags.Instance;
@@ -351,7 +341,6 @@ public static partial class Bridge
     internal static Exception Unwrap(Exception ex) =>
         ex is TargetInvocationException { InnerException: { } inner } ? Unwrap(inner) : ex;
 
-    // ── full-pipeline helpers (parse + dispatch + serialise) ──────────────────
     // Used by benchmarks to give a fair end-to-end comparison of protocols.
 
     internal static byte[] PipelineJson(ReadOnlySpan<byte> jsonRequest)
@@ -377,8 +366,6 @@ public static partial class Bridge
         return buf.WrittenSpan.ToArray();
     }
 
-    // ── JSON response writers ─────────────────────────────────────────────────
-
     private static unsafe void WriteResult(DispatchResult res, byte** outPtr, int* outLen)
     {
         var buf = new ArrayBufferWriter<byte>(256);

package/framework/dotnet-bridge/Bridge.JsDelegate.cs

@@ -10,8 +10,6 @@ namespace NativeScriptBridge;
 
 public static partial class Bridge
 {
-    // ── JS delegate creation ──────────────────────────────────────────────────
-    //
     // opcode 0x09: given a delegate type name (or "" for System.Action) and a
     // JS callback id, compile a .NET delegate that serialises its parameters as
     // binary and calls back into V8 via the s_jsInvoker function pointer.
@@ -51,8 +49,6 @@ public static partial class Bridge
         return Box(del);
     }
 
-    // ── Callback invocation helper ────────────────────────────────────────────
-
     internal static unsafe void CallJsCallback(int id, object?[] args)
     {
         if (s_jsInvoker == null) return;

package/framework/dotnet-bridge/Bridge.cs

@@ -97,7 +97,6 @@ public static partial class Bridge
         try { return JsonSerializer.Serialize(map); } catch { return "{}"; }
     }
 
-    // Static ctor: initialize assembly search directories and register resolver.
     static Bridge()
     {
         try

package/framework/dotnet-bridge/DispatchTypes.cs

@@ -12,14 +12,10 @@ using System.Threading.Tasks;
 
 namespace NativeScriptBridge;
 
-// ── JSON source-gen context ───────────────────────────────────────────────────
-
 [JsonSerializable(typeof(InvokeRequest))]
 [JsonSourceGenerationOptions(PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase)]
 internal partial class BridgeJsonContext : JsonSerializerContext { }
 
-// ── JSON wire type ────────────────────────────────────────────────────────────
-
 internal sealed record InvokeRequest(
     string?        Assembly,
     string?        TypeName,
@@ -28,7 +24,6 @@ internal sealed record InvokeRequest(
     JsonElement[]? Args
 );
 
-// ── cache key structs ─────────────────────────────────────────────────────────
 //
 // Using Type as the key field (rather than Type.FullName) is correct and faster:
 // Type instances are singletons within an AssemblyLoadContext, so reference
@@ -38,8 +33,6 @@ internal readonly record struct MethodKey(Type Type, string Name, int ArgCount,
 internal readonly record struct PropKey(Type Type, string Name, BindingFlags Flags);
 internal readonly record struct CtorKey(Type Type, int ArgCount);
 
-// ── cache value types ─────────────────────────────────────────────────────────
-
 internal readonly struct DispatchEntry(Func<object?, object?[], object?>? invoke, ParameterInfo[] parameters)
 {
     public readonly Func<object?, object?[], object?>? Invoke     = invoke;
@@ -53,8 +46,6 @@ internal readonly struct CtorEntry(ConstructorInfo? ctor, ParameterInfo[] parame
     public readonly ParameterInfo[]  Parameters = parameters;
 }
 
-// ── dispatch result ───────────────────────────────────────────────────────────
-
 internal enum DispatchKind : byte { Void, Primitive, Handle, Collection, Members }
 
 internal readonly struct DispatchResult
@@ -108,8 +99,6 @@ internal readonly struct DispatchResult
 
     internal int HandleId() => _handle;
 
-    // ── JSON serialisation ────────────────────────────────────────────────────
-
     public void WriteTo(Utf8JsonWriter w, JsonSerializerOptions opts)
     {
         switch (_kind)
@@ -158,7 +147,6 @@ internal readonly struct DispatchResult
         w.WriteEndArray();
     }
 
-    // ── binary serialisation ──────────────────────────────────────────────────
     //
     // Response tags:
     //   0x00 = null   0x01 = false   0x02 = true
@@ -262,8 +250,6 @@ internal readonly struct DispatchResult
     }
 }
 
-// ── async result helpers ──────────────────────────────────────────────────────
-
 internal static class TaskResultCache
 {
     private static readonly ConcurrentDictionary<Type, Func<Task, object?>> s_cache = new();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/windows",
-  "version": "0.1.0-alpha.52",
+  "version": "0.1.0-alpha.54",
   "description": "NativeScript for using Windows v8",
   "repository": {
         "type": "git",