@nativescript/windows 0.1.0-alpha.10 → 0.1.0-alpha.12

package/framework/__PROJECT_NAME__/App.xaml.cs

@@ -19,16 +19,44 @@ namespace __PROJECT_NAME__
             this.UnhandledException += OnUnhandledException;
         }
 
-        protected override void OnLaunched(LaunchActivatedEventArgs e)
+        protected override async void OnLaunched(LaunchActivatedEventArgs e)
         {
             _runtimeHost.Initialize();
+
+            // Show crash report from the previous run if one exists.
+            try
+            {
+                var panicLogPath = System.IO.Path.Combine(
+                    ApplicationData.Current.LocalFolder.Path, "nativescript-panic.log");
+                if (System.IO.File.Exists(panicLogPath))
+                {
+                    var content = System.IO.File.ReadAllText(panicLogPath);
+                    System.IO.File.Delete(panicLogPath);
+                    if (!string.IsNullOrWhiteSpace(content))
+                        await CrashDiagnostics.ShowCrashDialogAsync("Crash from previous run", content);
+                }
+            }
+            catch { }
+
+            string jsError = null;
             try
             {
                 _runtimeHost.RunMainScript();
+                jsError = _runtimeHost.GetLastJsError();
+                if (!string.IsNullOrEmpty(jsError))
+                {
+                    CrashDiagnostics.WriteMessage("JS Error", jsError);
+                    var report = CrashDiagnostics.BuildErrorReport(null, jsError);
+                    await CrashDiagnostics.ShowCrashDialogAsync("JavaScript Error", report);
+                }
             }
             catch (Exception scriptEx)
             {
+                jsError = _runtimeHost.GetLastJsError();
                 System.Diagnostics.Debug.WriteLine($"[NativeScript] Script exception: {scriptEx.Message}");
+                CrashDiagnostics.WriteExceptionReport("RunMainScript", scriptEx, null);
+                var report = CrashDiagnostics.BuildErrorReport(scriptEx, jsError);
+                await CrashDiagnostics.ShowCrashDialogAsync("Script Execution Error", report);
             }
 
 #if DEBUG
@@ -66,10 +94,16 @@ namespace __PROJECT_NAME__
 
         private void OnUnhandledException(object sender, Windows.UI.Xaml.UnhandledExceptionEventArgs e)
         {
+            e.Handled = true;
+            var jsError = _runtimeHost.GetLastJsError();
             CrashDiagnostics.WriteExceptionReport(
                 "Xaml.UnhandledException",
                 e.Exception,
-                "Message=" + e.Message + "; Handled=" + e.Handled);
+                "JsError=" + (jsError ?? "<none>"));
+
+            var report = CrashDiagnostics.BuildErrorReport(e.Exception, jsError);
+            var _ = CrashDiagnostics.ShowCrashDialogAsync(
+                e.Message ?? "Unhandled exception", report);
         }
 
 #if DEBUG

package/framework/__PROJECT_NAME__/CrashDiagnostics.cs

@@ -2,7 +2,10 @@ using System;
 using System.IO;
 using System.Text;
 using System.Threading.Tasks;
+using Windows.ApplicationModel.Core;
+using Windows.ApplicationModel.DataTransfer;
 using Windows.Storage;
+using Windows.UI.Popups;
 
 namespace __PROJECT_NAME__
 {
@@ -53,6 +56,118 @@ namespace __PROJECT_NAME__
             AppendToLog(sb.ToString());
         }
 
+        public static string BuildErrorReport(Exception ex, string jsError = null, string extraDetails = null)
+        {
+            var sb = new StringBuilder();
+
+            if (!string.IsNullOrWhiteSpace(jsError))
+            {
+                sb.AppendLine("── JavaScript Error ──────────────────────────────────────");
+                sb.AppendLine(jsError.Trim());
+                sb.AppendLine();
+            }
+
+            if (ex != null)
+            {
+                sb.AppendLine("── Native Exception ──────────────────────────────────────");
+                sb.AppendLine(ex.GetType().Name + ": " + ex.Message);
+                if (ex.StackTrace != null) sb.AppendLine(ex.StackTrace);
+                var inner = ex.InnerException;
+                while (inner != null)
+                {
+                    sb.AppendLine("Caused by: " + inner.GetType().Name + ": " + inner.Message);
+                    if (inner.StackTrace != null) sb.AppendLine(inner.StackTrace);
+                    inner = inner.InnerException;
+                }
+                sb.AppendLine();
+            }
+
+            // Include panic log from previous or current run
+            try
+            {
+                var panicLog = Path.Combine(ApplicationData.Current.LocalFolder.Path, "nativescript-panic.log");
+                if (File.Exists(panicLog))
+                {
+                    var content = File.ReadAllText(panicLog, Encoding.UTF8).Trim();
+                    if (!string.IsNullOrEmpty(content))
+                    {
+                        sb.AppendLine("── Rust Panic Log ────────────────────────────────────────");
+                        sb.AppendLine(content);
+                        sb.AppendLine();
+                    }
+                }
+            }
+            catch { }
+
+            if (!string.IsNullOrWhiteSpace(extraDetails))
+            {
+                sb.AppendLine("── Additional Info ───────────────────────────────────────");
+                sb.AppendLine(extraDetails);
+                sb.AppendLine();
+            }
+
+            sb.AppendLine("──────────────────────────────────────────────────────────");
+            sb.AppendLine("Timestamp: " + DateTimeOffset.UtcNow.ToString("o"));
+
+            return sb.ToString();
+        }
+
+        public static string CrashLogPath()
+        {
+            try { return Path.Combine(ApplicationData.Current.LocalFolder.Path, "nativescript-crash.log"); }
+            catch { return null; }
+        }
+
+        public static async Task ShowCrashDialogAsync(string heading, string errorReport)
+        {
+            try
+            {
+                // Write full details to log so developer can access them even if the
+                // dialog summary is truncated.
+                var logPath = CrashLogPath();
+                if (logPath != null)
+                    File.WriteAllText(logPath, errorReport, Encoding.UTF8);
+
+                // Truncate for the dialog (MessageDialog has practical limits).
+                const int MaxLen = 800;
+                var summary = errorReport.Length > MaxLen
+                    ? errorReport.Substring(0, MaxLen) + "\n\n[truncated — see log for full details]"
+                    : errorReport;
+
+                if (logPath != null)
+                    summary += "\n\nFull log: " + logPath;
+
+                var dialog = new MessageDialog(summary, "NativeScript Runtime Error");
+
+                dialog.Commands.Add(new UICommand("Copy Details", _ =>
+                {
+                    try
+                    {
+                        var dp = new DataPackage();
+                        dp.SetText(errorReport);
+                        Clipboard.SetContent(dp);
+                    }
+                    catch { }
+                }));
+
+                dialog.Commands.Add(new UICommand("Restart App", async _ =>
+                {
+                    try { await CoreApplication.RequestRestartAsync("crash-restart"); }
+                    catch { }
+                }));
+
+                dialog.Commands.Add(new UICommand("Dismiss"));
+                dialog.DefaultCommandIndex = 0;
+                dialog.CancelCommandIndex = 2;
+
+                await dialog.ShowAsync();
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine("[NativeScript] Failed to show crash dialog: " + ex.Message);
+            }
+        }
+
         private static void AppendToLog(string content)
         {
             try

package/framework/__PROJECT_NAME__/Package.appxmanifest

@@ -2,17 +2,14 @@
 
 <Package
   xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
-  xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
   xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
-  IgnorableNamespaces="uap mp">
+  IgnorableNamespaces="uap">
 
   <Identity
     Name="__APP_IDENTIFIER__"
     Publisher="CN=__PROJECT_NAME__"
     Version="1.0.0.0" />
 
-  <mp:PhoneIdentity PhoneProductId="__APP_IDENTIFIER__" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
-
   <Properties>
     <DisplayName>__PROJECT_NAME__</DisplayName>
     <PublisherDisplayName>__PROJECT_NAME__</PublisherDisplayName>
@@ -24,7 +21,7 @@
   </Dependencies>
 
   <Resources>
-    <Resource Language="x-generate"/>
+    <Resource Language="en-US"/>
   </Resources>
 
   <Applications>

package/framework/__PROJECT_NAME__/RuntimeHost.cs

@@ -27,6 +27,15 @@ namespace __PROJECT_NAME__
         [DllImport(NativeScriptLibrary, EntryPoint = nameof(runtime_install_ctrlc_handler))]
         private static extern void runtime_install_ctrlc_handler(int exitCode);
 
+        [DllImport(NativeScriptLibrary, EntryPoint = nameof(runtime_set_local_folder))]
+        private static extern void runtime_set_local_folder([MarshalAs(UnmanagedType.LPUTF8Str)] string localFolder);
+
+        [DllImport(NativeScriptLibrary, EntryPoint = nameof(runtime_get_last_js_error))]
+        private static extern IntPtr runtime_get_last_js_error();
+
+        [DllImport(NativeScriptLibrary, EntryPoint = nameof(runtime_free_js_error))]
+        private static extern void runtime_free_js_error(IntPtr ptr);
+
 #if DEBUG
         [DllImport(NativeScriptLibrary, EntryPoint = nameof(runtime_devtools_start))]
         private static extern IntPtr runtime_devtools_start(long runtime, ushort port);
@@ -39,10 +48,17 @@ namespace __PROJECT_NAME__
 
         public string DevtoolsFrontendUrl { get; private set; }
 
+        private bool _devtoolsPumpAvailable = true;
+
         public void PumpDevtools()
         {
-            if (!_initialized) return;
+            if (!_initialized || !_devtoolsPumpAvailable) return;
             try { runtime_devtools_pump(_runtime); }
+            catch (System.EntryPointNotFoundException)
+            {
+                // DLL built without devtools feature — stop trying.
+                _devtoolsPumpAvailable = false;
+            }
             catch (Exception ex)
             {
                 System.Diagnostics.Debug.WriteLine($"[NativeScript DevTools] Pump failed: {ex.Message}");
@@ -83,6 +99,7 @@ namespace __PROJECT_NAME__
             if (_initialized) return;
             AttachConsole(ATTACH_PARENT_PROCESS);
             runtime_install_ctrlc_handler(0);
+            runtime_set_local_folder(Windows.Storage.ApplicationData.Current.LocalFolder.Path);
             _runtime = runtime_init(AppContext.BaseDirectory);
 #if DEBUG
             if (ConsumeDebugBreakMarker())
@@ -227,6 +244,24 @@ namespace __PROJECT_NAME__
             return null;
         }
 
+        /// Returns the last JavaScript error (message + stack trace) captured during
+        /// script execution, or null if no error was recorded since the last call.
+        public string GetLastJsError()
+        {
+            if (!_initialized) return null;
+            IntPtr ptr = IntPtr.Zero;
+            try
+            {
+                ptr = runtime_get_last_js_error();
+                return ptr == IntPtr.Zero ? null : Marshal.PtrToStringUTF8(ptr);
+            }
+            catch { return null; }
+            finally
+            {
+                if (ptr != IntPtr.Zero) runtime_free_js_error(ptr);
+            }
+        }
+
         public void Dispose()
         {
             if (!_initialized) return;

package/framework/__PROJECT_NAME__/__PROJECT_NAME__.csproj

@@ -25,6 +25,10 @@
     <NSLibPlatform Condition="'$(Platform)' != ''">$(Platform)</NSLibPlatform>
     <NSLibPlatform Condition="'$(NSLibPlatform)' == '' and '$(RuntimeIdentifier)' != ''">$([System.Text.RegularExpressions.Regex]::Replace('$(RuntimeIdentifier)','^win-',''))</NSLibPlatform>
     <NSLibPlatform Condition="'$(NSLibPlatform)' == ''">x64</NSLibPlatform>
+    <!-- Windows SDK .NET runtime pack location (resolved from NuGet cache) -->
+    <_WinSdkNetRefPkg>$(NuGetPackageRoot)microsoft.windows.sdk.net.ref</_WinSdkNetRefPkg>
+    <_WinSdkNetRefVer Condition="Exists('$(_WinSdkNetRefPkg)\10.0.26100.57')">10.0.26100.57</_WinSdkNetRefVer>
+    <_WinSdkNetRefLib Condition="'$(_WinSdkNetRefVer)' != ''">$(_WinSdkNetRefPkg)\$(_WinSdkNetRefVer)\lib\net8.0</_WinSdkNetRefLib>
   </PropertyGroup>
 
   <ItemGroup>
@@ -41,6 +45,29 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
 
+    <!-- UWP logo/splash assets required for Add-AppxPackage -Register -->
+    <Content Include="Assets\**\*" Condition="Exists('Assets')">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+
+    <!-- Windows SDK .NET runtime pack assemblies — required when the dotnet workload
+         is not installed; copied from the NuGet package cache. -->
+    <Content Include="$(_WinSdkNetRefLib)\Microsoft.Windows.UI.Xaml.dll"
+             Condition="'$(_WinSdkNetRefLib)' != '' and Exists('$(_WinSdkNetRefLib)\Microsoft.Windows.UI.Xaml.dll')">
+      <Link>Microsoft.Windows.UI.Xaml.dll</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="$(_WinSdkNetRefLib)\WinRT.Runtime.dll"
+             Condition="'$(_WinSdkNetRefLib)' != '' and Exists('$(_WinSdkNetRefLib)\WinRT.Runtime.dll')">
+      <Link>WinRT.Runtime.dll</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="$(_WinSdkNetRefLib)\Microsoft.Windows.SDK.NET.dll"
+             Condition="'$(_WinSdkNetRefLib)' != '' and Exists('$(_WinSdkNetRefLib)\Microsoft.Windows.SDK.NET.dll')">
+      <Link>Microsoft.Windows.SDK.NET.dll</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+
     <!-- Debug: devtools-enabled runtime DLL (platform fallback via NSLibPlatform) -->
     <Content Include="$(NSWindowsRoot)\libs\devtools\$(NSLibPlatform)\nativescript.dll"
              Condition="'$(Configuration)' == 'Debug' and Exists('$(NSWindowsRoot)\libs\devtools\$(NSLibPlatform)\nativescript.dll')">

package/package.json

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