App.xaml.cs was 461 lines / 21KB and conflated four concerns: process- level lifecycle (mutex / message pump filter / shutdown), engine bootstrap (NDI runtime / IsoController / view model construction), crash handling (three exception channels + log directory + dialog), and the background update-checker kickoff. Splits via partial-class into themed sibling files: * App.xaml.cs (was 461L → now 219L) — class skeleton, fields, internal property accessors, Win32 P/Invoke surface, OnStartup as a wiring pipeline that calls the bootstrap steps in order, OnExit, CLI parser. * App.Bootstrap.cs (250L, new) — linear startup steps: TryAcquireSingleInstance, TryBootstrapNdiInterop, BootstrapEngine, ConstructAndShowMainWindow, BootstrapControlSurfaceServices, BootstrapTrayIcon, TryShowOnboarding, TryAutoLaunchTeams. Each returns a signal (bool / window ref) when OnStartup needs it to decide whether to continue. * App.CrashHandlers.cs (93L, new) — OnAppDomainUnhandled, OnDispatcherUnhandled, OnUnobservedTaskException, TryLogFatal, TryShowCrashDialog, LogDirectory. * App.UpdateCheckBootstrap.cs (42L, new) — StartBackgroundUpdateCheck (24h-throttled, fire-and-forget). OnStartup's body is now a 30-ish-line procedure that names each step, which is what the original was trying to be. Comments inline the "happened before, kept here for reason X" notes (theme.Apply before window show; CLI args parsed before InitializeAsync). Behavior is unchanged — Shutdown codes, error paths, and the side-effect order are all preserved. Build clean (0 warnings, 0 errors); 56 + 104 tests still pass. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
93 lines
3.6 KiB
C#
93 lines
3.6 KiB
C#
using System.IO;
|
|
using System.Windows;
|
|
using System.Windows.Threading;
|
|
using Microsoft.Extensions.Logging;
|
|
|
|
namespace TeamsISO.App;
|
|
|
|
// Crash diagnostics — the three exception channels WPF leaves open by
|
|
// default, wired to a single handler that logs Fatal to Serilog (rolling
|
|
// daily file at %LOCALAPPDATA%\TeamsISO\Logs) and then shows the user a
|
|
// dialog with the log path so they can attach it to a bug report.
|
|
//
|
|
// We deliberately don't catch StackOverflowException or
|
|
// ExecutionEngineException — both are uncatchable in modern .NET; if one
|
|
// fires the OS Watson dialog takes it from here.
|
|
public partial class App
|
|
{
|
|
/// <summary>
|
|
/// Where the rolling Serilog file sink writes. Reused by the crash
|
|
/// dialog so we can show the user the exact directory to attach when
|
|
/// filing a bug.
|
|
/// </summary>
|
|
private static string LogDirectory =>
|
|
Path.Combine(
|
|
Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
|
|
"TeamsISO", "Logs");
|
|
|
|
private void OnAppDomainUnhandled(object sender, UnhandledExceptionEventArgs e)
|
|
{
|
|
// IsTerminating is almost always true here — finalizers and
|
|
// managed-thread top-frames don't have a graceful path back. Log
|
|
// + show a dialog inline since the process will exit either way.
|
|
var ex = e.ExceptionObject as Exception;
|
|
TryLogFatal("AppDomain.UnhandledException", ex);
|
|
TryShowCrashDialog(ex, terminating: e.IsTerminating);
|
|
}
|
|
|
|
private void OnDispatcherUnhandled(object sender, DispatcherUnhandledExceptionEventArgs e)
|
|
{
|
|
TryLogFatal("Dispatcher.UnhandledException", e.Exception);
|
|
TryShowCrashDialog(e.Exception, terminating: false);
|
|
// Mark Handled so a single bad UI thunk doesn't take the whole app
|
|
// down — the user has the dialog and the log; they can choose to
|
|
// keep going.
|
|
e.Handled = true;
|
|
}
|
|
|
|
private void OnUnobservedTaskException(object? sender, System.Threading.Tasks.UnobservedTaskExceptionEventArgs e)
|
|
{
|
|
TryLogFatal("TaskScheduler.UnobservedTaskException", e.Exception);
|
|
// Don't show a dialog here — these fire from the finalizer thread
|
|
// and tend to be cleanup-time noise, not user-actionable. Log only.
|
|
e.SetObserved();
|
|
}
|
|
|
|
private void TryLogFatal(string source, Exception? ex)
|
|
{
|
|
try
|
|
{
|
|
var logger = _loggerFactory?.CreateLogger<App>();
|
|
logger?.LogCritical(ex, "{Source} fired", source);
|
|
}
|
|
catch
|
|
{
|
|
// Logger itself failed (rare — disk full, permission denied).
|
|
// Swallow: nothing useful to do, and re-throwing during crash
|
|
// handling makes things worse.
|
|
}
|
|
}
|
|
|
|
private static void TryShowCrashDialog(Exception? ex, bool terminating)
|
|
{
|
|
try
|
|
{
|
|
var heading = terminating
|
|
? "TeamsISO encountered an unrecoverable error and will exit."
|
|
: "TeamsISO encountered an error.";
|
|
var details = ex?.GetType().Name + ": " + (ex?.Message ?? "(no details)");
|
|
var body =
|
|
heading + "\n\n" +
|
|
details + "\n\n" +
|
|
$"A full diagnostic log has been written to:\n{LogDirectory}\n\n" +
|
|
"Attach the most recent file from that directory to your bug report.";
|
|
MessageBox.Show(body, "TeamsISO — Error",
|
|
MessageBoxButton.OK, MessageBoxImage.Error);
|
|
}
|
|
catch
|
|
{
|
|
// Even the dialog failed (e.g., during shutdown when the
|
|
// message pump is already gone). Nothing more to do.
|
|
}
|
|
}
|
|
}
|