Update WPFCLI to add keep alive startup param handling

src/DynamoCoreWpf/ViewModels/Watch3D/DefaultWatch3DViewModel.cs

@@ -195,7 +195,14 @@ internal WorkspaceViewModel CurrentSpaceViewModel
         {
             get
             {
-                return viewModel.Workspaces.FirstOrDefault(vm => vm.Model == dynamoModel.CurrentWorkspace);
+                if (viewModel == null)
+                {
+                    return null;
+                }
+                else
+                {
+                    return viewModel.Workspaces.FirstOrDefault(vm => vm.Model == dynamoModel.CurrentWorkspace);
+                }
             }
         }
 

src/DynamoWPFCLI/DynamoWPFCLI.csproj

@@ -52,6 +52,7 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\AssemblySharedInfoGenerator\AssemblySharedInfo.cs">

src/DynamoWPFCLI/Program.cs

@@ -1,8 +1,12 @@
 using System;
+using System.Threading;
 using Dynamo.Applications;
+using Dynamo.Controls;
 using Dynamo.Models;
 using Dynamo.ViewModels;
+using Dynamo.Wpf.Extensions;
 using Dynamo.Wpf.ViewModels.Watch3D;
+using static System.Windows.Threading.Dispatcher;
 
 namespace DynamoWPFCLI
 {
@@ -16,29 +20,26 @@ static internal void Main(string[] args)
             {
                 var cmdLineArgs = StartupUtils.CommandLineArguments.Parse(args);
                 var locale = StartupUtils.SetLocale(cmdLineArgs);
-                DynamoModel model;
-                if (!String.IsNullOrEmpty(cmdLineArgs.ASMPath))
+
+                if (cmdLineArgs.KeepAlive)
                 {
-                    model = Dynamo.Applications.StartupUtils.MakeModel(true, cmdLineArgs.ASMPath);
+                    var thread = new Thread(() => RunKeepAlive(cmdLineArgs));
+
+                    thread.SetApartmentState(ApartmentState.STA);
+                    thread.Start();
+
+                    Console.WriteLine("Starting DynamoWPFCLI in keepalive mode");
+                    Console.ReadLine();
+
+                    ShutDown();
                 }
                 else
                 {
-                    model = Dynamo.Applications.StartupUtils.MakeModel(true);
+                    var viewModel = StartupDaynamo(cmdLineArgs);
+
+                    var runner = new CommandLineRunnerWPF(viewModel);
+                    runner.Run(cmdLineArgs);
                 }
-                var viewModel = DynamoViewModel.Start(
-                    new DynamoViewModel.StartConfiguration()
-                    {
-                        DynamoModel = model,
-                        Watch3DViewModel = new DefaultWatch3DViewModel(null, new Watch3DViewModelStartupParams(model))
-                        {
-                            Active = false,
-                            CanBeActivated = false
-                        }
-                    });
-
-                var runner = new CommandLineRunnerWPF(viewModel);
-                runner.Run(cmdLineArgs);
-
             }
             catch (Exception e)
             {
@@ -56,5 +57,55 @@ static internal void Main(string[] args)
             }
         }
 
+        private static DynamoViewModel StartupDaynamo(StartupUtils.CommandLineArguments cmdLineArgs)
+        {
+            DynamoModel model;
+            if (!String.IsNullOrEmpty(cmdLineArgs.ASMPath))
+            {
+                model = Dynamo.Applications.StartupUtils.MakeModel(true, cmdLineArgs.ASMPath);
+            }
+            else
+            {
+                model = Dynamo.Applications.StartupUtils.MakeModel(true);
+            }
+
+            model.ShutdownCompleted += (m) => { ShutDown(); };
+
+            var viewModel = DynamoViewModel.Start(
+                new DynamoViewModel.StartConfiguration()
+                {
+                    DynamoModel = model,
+                    Watch3DViewModel = new DefaultWatch3DViewModel(null, new Watch3DViewModelStartupParams(model))
+                    {
+                        Active = false,
+                        CanBeActivated = false
+                    }
+                });
+            return viewModel;
+        }
+
+        private static void RunKeepAlive(StartupUtils.CommandLineArguments cmdLineArgs)
+        {
+            try
+            {
+                StartupDaynamo(cmdLineArgs);
+
+                Console.WriteLine("-----------------------------------------");
+                Console.WriteLine("DynamoWPFCLI is running in keepalive mode");
+                Console.WriteLine("Press Enter to shutdown...");
+
+                Run();
+            }
+            catch
+            {
+                Console.WriteLine("Server is shutting down due to an error");
+            }
+        }
+
+        private static void ShutDown()
+        {
+            Environment.Exit(0);
+        }
+
     }
 }