@nativescript/windows-v8 0.1.0-alpha.145 → 0.1.0-beta.5

package/framework/__PROJECT_NAME__/RuntimeHost.cs

@@ -53,6 +53,7 @@ namespace __PROJECT_NAME__
         private static extern void runtime_free_js_error(IntPtr ptr);
 
         [DllImport(NativeScriptLibrary, EntryPoint = nameof(runtime_has_devtools))]
+        [return: MarshalAs(UnmanagedType.U1)]
         private static extern bool runtime_has_devtools();
 
         [DllImport(NativeScriptLibrary, EntryPoint = nameof(runtime_pump_timers))]
@@ -110,6 +111,21 @@ namespace __PROJECT_NAME__
         [DllImport(NativeScriptLibrary, EntryPoint = nameof(runtime_free_string))]
         private static extern void runtime_free_string(IntPtr ptr);
 
+        [DllImport(NativeScriptLibrary, EntryPoint = nameof(runtime_devtools_wait_for_debugger))]
+        [return: MarshalAs(UnmanagedType.U1)]
+        private static extern bool runtime_devtools_wait_for_debugger(long runtime, uint timeoutMs);
+
+        // iOS uses 41000 and Android 42000.
+        private const ushort DevtoolsPort = 43000;
+        private const uint DebuggerWaitTimeoutMs = 30000;
+
+        // LocalFolder sentinel files shared with the CLI's WindowsApplicationManager.
+        private const string InspectorMarker = "ns-inspector";
+        private const string DebugBreakMarker = "ns-debugbreak";
+        private const string DebuggerStartedMarker = "ns-debugger-started";
+
+        private bool _waitForDebugger;
+
         public string DevtoolsFrontendUrl { get; private set; }
 
         private bool _devtoolsAvailable;
@@ -130,7 +146,7 @@ namespace __PROJECT_NAME__
             IntPtr urlPtr = IntPtr.Zero;
             try
             {
-                urlPtr = runtime_devtools_start(_runtime, 42000);
+                urlPtr = runtime_devtools_start(_runtime, DevtoolsPort);
                 if (urlPtr == IntPtr.Zero) return;
                 var wsUrl = Marshal.PtrToStringUTF8(urlPtr);
                 DevtoolsFrontendUrl = wsUrl != null
@@ -139,6 +155,8 @@ namespace __PROJECT_NAME__
                 if (DevtoolsFrontendUrl != null)
                 {
                     _devtoolsAvailable = true;
+                    // The server may fall back to the next free port.
+                    WriteMarker(DebuggerStartedMarker, new Uri(wsUrl).Port.ToString());
                     System.Diagnostics.Debug.WriteLine($"[NativeScript DevTools] {DevtoolsFrontendUrl}");
                 }
             }
@@ -191,31 +209,48 @@ namespace __PROJECT_NAME__
                 }
             }
             catch { }
-            if (ConsumeDebugBreakMarker())
+            DeleteMarker(DebuggerStartedMarker);
+            var debugBreak = ConsumeMarker(DebugBreakMarker);
+            if (ConsumeMarker(InspectorMarker) || debugBreak)
+            {
                 StartDevtoolsSafely();
+                _waitForDebugger = debugBreak && _devtoolsAvailable;
+            }
 #endif
             _initialized = true;
         }
 
 #if DEBUG
-        /// <summary>
-        /// Returns true and deletes the marker if the CLI wrote ns-debugbreak to LocalFolder,
-        /// matching the Android sentinel-file pattern used by the NativeScript CLI.
-        /// </summary>
-        private static bool ConsumeDebugBreakMarker()
+        private static string MarkerPath(string name) =>
+            Path.Combine(Windows.Storage.ApplicationData.Current.LocalFolder.Path, name);
+
+        private static bool ConsumeMarker(string name)
         {
             try
             {
-                var markerPath = System.IO.Path.Combine(
-                    Windows.Storage.ApplicationData.Current.LocalFolder.Path,
-                    "ns-debugbreak");
-                if (!System.IO.File.Exists(markerPath))
+                var markerPath = MarkerPath(name);
+                if (!File.Exists(markerPath))
                     return false;
-                System.IO.File.Delete(markerPath);
+                File.Delete(markerPath);
                 return true;
             }
             catch { return false; }
         }
+
+        private static void WriteMarker(string name, string contents)
+        {
+            try { File.WriteAllText(MarkerPath(name), contents); }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"[NativeScript DevTools] Could not write {name}: {ex.Message}");
+            }
+        }
+
+        private static void DeleteMarker(string name)
+        {
+            try { File.Delete(MarkerPath(name)); }
+            catch { }
+        }
 #endif
 
         /// Reads a file that may live inside a sealed app.nsbundle instead of on disk: tries the
@@ -244,6 +279,15 @@ namespace __PROJECT_NAME__
             if (!_initialized)
                 throw new InvalidOperationException("Runtime must be initialized before running scripts.");
 
+#if DEBUG
+            if (_waitForDebugger)
+            {
+                // --debug-brk: hold the first script until DevTools attaches.
+                _waitForDebugger = false;
+                if (!runtime_devtools_wait_for_debugger(_runtime, DebuggerWaitTimeoutMs))
+                    System.Diagnostics.Debug.WriteLine("[NativeScript DevTools] No debugger attached, continuing.");
+            }
+#endif
             var entryPath = ResolveEntryScriptPath();
             if (entryPath == null)
             {

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

@@ -351,7 +351,7 @@ public static partial class Bridge
             : DispatchResult.Handle(id, typeName);
     }
 
-    private static bool IsAwaitable(object value, Type t)
+    private static bool IsAwaitable(object? value, Type t)
     {
         if (value is Task || value is ValueTask) return true;
         if (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(ValueTask<>)) return true;

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

@@ -421,7 +421,6 @@ public static partial class Bridge
             // look up or dynamically emit a proxy for the correct base class.
             string? resolveFrom = typeName;
             if (!string.IsNullOrEmpty(assemblyName)
-                && typeName != null
                 && typeName.StartsWith("com.tns.gen.winrt.", StringComparison.Ordinal))
             {
                 resolveFrom = assemblyName;

package/framework/dotnet-bridge/Bridge.cs

@@ -115,7 +115,7 @@ public static partial class Bridge
                             var simple = Path.GetFileNameWithoutExtension(file);
                             if (string.IsNullOrEmpty(simple)) continue;
 
-                            Assembly asm = AppDomain.CurrentDomain.GetAssemblies()
+                            Assembly? asm = AppDomain.CurrentDomain.GetAssemblies()
                                 .FirstOrDefault(a => string.Equals(a.GetName().Name, simple, StringComparison.OrdinalIgnoreCase));
                             if (asm is null)
                             {
@@ -540,7 +540,7 @@ public static partial class Bridge
                 {
                     var handlerType = ev.EventHandlerType;
                     var method = typeof(Bridge).GetMethod(nameof(CoreApplicationUnhandledErrorHandler), BindingFlags.NonPublic | BindingFlags.Static);
-                    if (method != null)
+                    if (handlerType != null && method != null)
                     {
                         var del = Delegate.CreateDelegate(handlerType, method);
                         ev.AddEventHandler(null, del);
@@ -633,7 +633,7 @@ public static partial class Bridge
         try
         {
             var iidLocal = s_iidIInspectable;
-            var hr = Marshal.QueryInterface(iunknown, ref iidLocal, out var inspectable);
+            var hr = Marshal.QueryInterface(iunknown, in iidLocal, out var inspectable);
             if (hr == 0 && inspectable != IntPtr.Zero)
             {
                 Marshal.Release(iunknown);

package/framework/dotnet-bridge/DotNetBridge.csproj

@@ -16,6 +16,14 @@
          host process is already running on net10. LatestMajor accepts any version >= 9. -->
     <RollForward>LatestMajor</RollForward>
   </PropertyGroup>
+  <ItemGroup>
+    <!-- The bridge only runs inside a Windows host, but the TFM stays plain net9.0 so the
+         net9.0 test/benchmark projects can reference it. Declaring the platform here keeps
+         CA1416 quiet for the Marshal COM APIs. Skipped when an OS-specific TFM already emits it. -->
+    <AssemblyAttribute Include="System.Runtime.Versioning.SupportedOSPlatformAttribute" Condition="'$(TargetPlatformIdentifier)' == ''">
+      <_Parameter1>windows</_Parameter1>
+    </AssemblyAttribute>
+  </ItemGroup>
   <Target Name="WriteDotNetToolDone" AfterTargets="Publish">
     <PropertyGroup>
       <DotNetToolDoneFile>$(MSBuildProjectDirectory)\publish\.dotnet_tool_done</DotNetToolDoneFile>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/windows-v8",
-  "version": "0.1.0-alpha.145",
+  "version": "0.1.0-beta.5",
   "description": "NativeScript Windows runtime (V8 engine) with a WinUI 3 app template",
   "keywords": [
     "NativeScript",