@nativescript/windows-hermes 0.1.0-alpha.146 → 0.1.0-beta.6

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/__PROJECT_NAME__/__PROJECT_NAME__.csproj

@@ -101,6 +101,17 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
 
+    <!-- The app's metadata filter (App_Resources/Windows/native-api-usage.json, which the CLI writes
+         out next to this project): the runtime reads it next to the exe. -->
+    <Content Include="$(NSWindowsRoot)\whitelist.mdg" Condition="Exists('$(NSWindowsRoot)\whitelist.mdg')">
+      <Link>whitelist.mdg</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="$(NSWindowsRoot)\blacklist.mdg" Condition="Exists('$(NSWindowsRoot)\blacklist.mdg')">
+      <Link>blacklist.mdg</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+
     <!-- Logo and splash assets required for the packaged desktop app manifest -->
     <Content Include="Assets\**\*" Condition="Exists('Assets')">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -175,6 +186,12 @@
         SkipUnchangedFiles="true" />
     </Target>
 
+  <!-- A filter the app dropped must not stay in force from an earlier build's copy. -->
+  <Target Name="RemoveStaleMetadataFilter" BeforeTargets="CopyFilesToOutputDirectory">
+    <Delete Files="$(OutDir)whitelist.mdg" Condition="!Exists('$(NSWindowsRoot)\whitelist.mdg')" />
+    <Delete Files="$(OutDir)blacklist.mdg" Condition="!Exists('$(NSWindowsRoot)\blacklist.mdg')" />
+  </Target>
+
     <!-- Run the Static Binding Generator (sbg) when project contains an sbg entry script
      or when pre-existing metadata is present. Generated proxies will be written
      into $(NSGenDir) and included in compilation. -->
@@ -193,11 +210,11 @@
            Search order: pre-built tools/ binary, then cargo run for dev. -->
       <Exec
         Command="&quot;$(SbgExe)&quot;"
-        EnvironmentVariables="NSWINRT_AUTO_METADATA_PATH=$(SBGMetadataSource);SBG_OUTPUT_DIR=$(SBG_OUTPUT_DIR);SBG_METADATA_SOURCE=$(SBGMetadataSource);SBG_TARGET_FRAMEWORK=$(TargetFramework);SBG_TARGET_PLATFORM_MIN_VERSION=$(TargetPlatformMinVersion);SBG_USE_UWP=false;SBG_APP_CS_SOURCES_DIR=$(MSBuildProjectDirectory)"
+        EnvironmentVariables="NSWINRT_AUTO_METADATA_PATH=$(SBGMetadataSource);SBG_OUTPUT_DIR=$(SBG_OUTPUT_DIR);SBG_METADATA_SOURCE=$(SBGMetadataSource);SBG_TARGET_FRAMEWORK=$(TargetFramework);SBG_TARGET_PLATFORM_MIN_VERSION=$(TargetPlatformMinVersion);SBG_USE_UWP=false;SBG_APP_CS_SOURCES_DIR=$(MSBuildProjectDirectory);SBG_WHITELIST=$(NSWindowsRoot)\whitelist.mdg;SBG_BLACKLIST=$(NSWindowsRoot)\blacklist.mdg"
         Condition="'$(SbgExe)' != '' and Exists('$(SBGMetadataSource)')" />
       <Exec WorkingDirectory="$(WindowsRuntimeRepoRoot)"
         Command="cargo run --quiet --manifest-path &quot;$(WindowsRuntimeRepoRoot)\Cargo.toml&quot; -p sbg"
-        EnvironmentVariables="NSWINRT_AUTO_METADATA_PATH=$(SBGMetadataSource);SBG_OUTPUT_DIR=$(SBG_OUTPUT_DIR);SBG_METADATA_SOURCE=$(SBGMetadataSource);SBG_TARGET_FRAMEWORK=$(TargetFramework);SBG_TARGET_PLATFORM_MIN_VERSION=$(TargetPlatformMinVersion);SBG_USE_UWP=false;SBG_APP_CS_SOURCES_DIR=$(MSBuildProjectDirectory)"
+        EnvironmentVariables="NSWINRT_AUTO_METADATA_PATH=$(SBGMetadataSource);SBG_OUTPUT_DIR=$(SBG_OUTPUT_DIR);SBG_METADATA_SOURCE=$(SBGMetadataSource);SBG_TARGET_FRAMEWORK=$(TargetFramework);SBG_TARGET_PLATFORM_MIN_VERSION=$(TargetPlatformMinVersion);SBG_USE_UWP=false;SBG_APP_CS_SOURCES_DIR=$(MSBuildProjectDirectory);SBG_WHITELIST=$(NSWindowsRoot)\whitelist.mdg;SBG_BLACKLIST=$(NSWindowsRoot)\blacklist.mdg"
         Condition="'$(SbgExe)' == '' and Exists('$(SBGMetadataSource)') and Exists('$(WindowsRuntimeRepoRoot)\Cargo.toml')" />
       <!-- The proxies are picked up here, after sbg ran: a glob evaluated with the project would
            still compile proxies an earlier run generated for extensions that are gone. -->

package/package.json

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