@nativescript/windows-hermes 1.0.0-beta.12 → 1.0.0-beta.14

package/framework/__PROJECT_NAME__/App.xaml.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Runtime.InteropServices;
 using System.Text.Json;
 using Windows.ApplicationModel;
 using Microsoft.UI.Dispatching;
@@ -31,7 +32,8 @@ namespace __PROJECT_NAME__
             Shown = 3,
             Hidden = 4,
             UncaughtError = 5,
-            Exit = 6
+            Exit = 6,
+            ExitSupported = 7
         }
 
         public App()
@@ -72,6 +74,8 @@ namespace __PROJECT_NAME__
             try
             {
                 _runtimeHost.RunMainScript();
+                // Tells the app it may end itself (Application.Exit()) once its last window closes.
+                _runtimeHost.NotifyAppEvent((int)AppEventKind.ExitSupported, null);
                 jsError = _runtimeHost.GetLastJsError();
                 if (!string.IsNullOrEmpty(jsError))
                 {
@@ -94,6 +98,9 @@ namespace __PROJECT_NAME__
             void ShowMainWindow()
             {
                 StartPump();
+#if DEBUG
+                _runtimeHost.WatchLiveSync(DispatcherQueue.GetForCurrentThread());
+#endif
 
                 try
                 {
@@ -117,13 +124,35 @@ namespace __PROJECT_NAME__
             }
         }
 
+        // This window is never shown, so it only closes when the app exits. JavaScript ends the app
+        // itself (Application.Exit()) once its last window closes, from inside a callback: the
+        // runtime is still on the stack then, so it is disposed after the current dispatcher work
+        // item has unwound.
         private void OnWindowClosed(object sender, WindowEventArgs e)
         {
             StopPump();
             _runtimeHost.NotifyAppEvent((int)AppEventKind.Exit, null);
             try { ApplicationData.Current.LocalSettings.Values[LastLaunchArgsKey] = string.Empty; }
             catch (InvalidOperationException) { } // unpackaged: no ApplicationData
+
+            var dispatcherQueue = DispatcherQueue.GetForCurrentThread();
+            if (dispatcherQueue == null || !dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, Shutdown))
+            {
+                Shutdown();
+            }
+        }
+
+        [DllImport("user32.dll")]
+        private static extern void PostQuitMessage(int exitCode);
+
+        private void Shutdown()
+        {
             _runtimeHost.Dispose();
+
+            // WinUI ignores Application.Exit() while no activated window is open
+            // (microsoft-ui-xaml#5931), which is the case once the app's windows have all closed,
+            // so the message loop is ended directly.
+            PostQuitMessage(0);
         }
 
         private void OnWindowActivated(object sender, WindowActivatedEventArgs e)

package/framework/__PROJECT_NAME__/RuntimeHost.cs

@@ -123,8 +123,60 @@ namespace __PROJECT_NAME__
         private const string InspectorMarker = "ns-inspector";
         private const string DebugBreakMarker = "ns-debugbreak";
         private const string DebuggerStartedMarker = "ns-debugger-started";
+        // The CLI writes LiveSyncMarker after syncing files into app\ (webpack HMR), but only
+        // while LiveSyncReadyMarker says this host is watching for it.
+        private const string LiveSyncMarker = "ns-livesync";
+        private const string LiveSyncReadyMarker = "ns-livesync-ready";
 
         private bool _waitForDebugger;
+        private FileSystemWatcher _liveSyncWatcher;
+
+        /// Applies CLI file syncs while the app runs, by calling global.__onLiveSync() on the UI
+        /// thread, as the Android and iOS runtimes do after a LiveSync.
+        public void WatchLiveSync(Microsoft.UI.Dispatching.DispatcherQueue dispatcherQueue)
+        {
+            if (!_initialized || _liveSyncWatcher != null || dispatcherQueue == null) return;
+            try
+            {
+                DeleteMarker(LiveSyncMarker);
+                var watcher = new FileSystemWatcher(LocalFolderPath, LiveSyncMarker)
+                {
+                    NotifyFilter = NotifyFilters.FileName | NotifyFilters.LastWrite,
+                };
+                FileSystemEventHandler onMarker = (_, _) => dispatcherQueue.TryEnqueue(ApplyLiveSync);
+                watcher.Created += onMarker;
+                watcher.Changed += onMarker;
+                watcher.EnableRaisingEvents = true;
+                _liveSyncWatcher = watcher;
+                WriteMarker(LiveSyncReadyMarker, "");
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"[NativeScript LiveSync] Watch failed: {ex.Message}");
+            }
+        }
+
+        private void ApplyLiveSync()
+        {
+            // One write raises several events; the first one consumes the marker.
+            if (!_initialized || !ConsumeMarker(LiveSyncMarker)) return;
+            try
+            {
+                runtime_runscript(_runtime, "typeof __onLiveSync === 'function' && __onLiveSync();", "ns-livesync.js");
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"[NativeScript LiveSync] Apply failed: {ex.Message}");
+            }
+        }
+
+        private void StopWatchingLiveSync()
+        {
+            if (_liveSyncWatcher == null) return;
+            _liveSyncWatcher.Dispose();
+            _liveSyncWatcher = null;
+            DeleteMarker(LiveSyncReadyMarker);
+        }
 
         public string DevtoolsFrontendUrl { get; private set; }
 
@@ -235,6 +287,7 @@ namespace __PROJECT_NAME__
             }
             catch { }
             DeleteMarker(DebuggerStartedMarker);
+            DeleteMarker(LiveSyncReadyMarker);
             var debugBreak = ConsumeMarker(DebugBreakMarker);
             if (ConsumeMarker(InspectorMarker) || debugBreak)
             {
@@ -476,6 +529,9 @@ namespace __PROJECT_NAME__
         public void Dispose()
         {
             if (!_initialized) return;
+#if DEBUG
+            StopWatchingLiveSync();
+#endif
             runtime_deinit(_runtime);
             _runtime = 0;
             _initialized = false;

package/package.json

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