Support for standalone LR host when watching.

Author: Silvenga

src/clients/Wyam/Commands/BuildCommand.cs

@@ -168,6 +168,7 @@ protected override ExitCode RunCommand(Preprocessor preprocessor)
             if (runLiveReloadServer)
             {
                 liveReloadServer = new LiveReloadServer();
+                liveReloadServer.StartStandaloneHost();
             }
 
             // Start the preview server

src/clients/Wyam/LiveReload/LiveReloadServer.cs

@@ -1,31 +1,55 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 
 using Microsoft.Owin;
 using Microsoft.Owin.FileSystems;
+using Microsoft.Owin.Hosting;
+using Microsoft.Owin.Hosting.Tracing;
 using Microsoft.Owin.StaticFiles;
 
 using Owin;
 using Owin.WebSocket.Extensions;
 
+using Wyam.Common.Tracing;
+using Wyam.Owin;
+
 namespace Wyam.LiveReload
 {
     internal class LiveReloadServer : IDisposable
     {
         private readonly ReloadClientServiceLocator _clientServiceLocator;
+        private IDisposable _server;
 
         public LiveReloadServer()
         {
             _clientServiceLocator = new ReloadClientServiceLocator();
         }
 
+        public void StartStandaloneHost(int port = 35729)
+        {
+            try
+            {
+                // This must be 127.0.0.1 due to http.sys hostname verification, LiveReload hardcodes it.
+                StartOptions options = new StartOptions("http://127.0.0.1:" + port);
+                options.Settings.Add(typeof(ITraceOutputFactory).FullName, typeof(NullTraceOutputFactory).AssemblyQualifiedName);
+                _server = WebApp.Start(options, InjectOwinMiddleware);
+            }
+            catch (Exception ex)
+            {
+                Trace.Warning($"Error while running the LiveReload server: {ex.Message}");
+            }
+
+            Trace.Verbose($"LiveReload server listening on port {port}.");
+        }
+
         public void InjectOwinMiddleware(IAppBuilder app)
         {
             // Host livereload.js
-            var liveReloadAssembly = typeof(LiveReloadServer).Assembly;
-            var rootNamespace = typeof(LiveReloadServer).Namespace;
-            var reloadFilesystem = new EmbeddedResourceFileSystem(liveReloadAssembly, $"{rootNamespace}");
+            Assembly liveReloadAssembly = typeof(LiveReloadServer).Assembly;
+            string rootNamespace = typeof(LiveReloadServer).Namespace;
+            IFileSystem reloadFilesystem = new EmbeddedResourceFileSystem(liveReloadAssembly, $"{rootNamespace}");
             app.UseStaticFiles(new StaticFileOptions
             {
                 RequestPath = PathString.Empty,
@@ -39,10 +63,10 @@ public void InjectOwinMiddleware(IAppBuilder app)
 
         public void RebuildCompleted(ICollection<string> filesChanged)
         {
-            var clientsToNotify = _clientServiceLocator?.ReloadClients ?? Enumerable.Empty<ReloadClient>();
-            foreach (var client in clientsToNotify.Where(x => x.IsConnected))
+            IEnumerable<ReloadClient> clientsToNotify = _clientServiceLocator.ReloadClients;
+            foreach (ReloadClient client in clientsToNotify.Where(x => x.IsConnected))
             {
-                foreach (var modifiedFile in filesChanged)
+                foreach (string modifiedFile in filesChanged)
                 {
                     client.NotifyOfChanges(modifiedFile);
                 }
@@ -51,6 +75,7 @@ public void RebuildCompleted(ICollection<string> filesChanged)
 
         public void Dispose()
         {
+            _server?.Dispose();
         }
     }
 }

src/clients/Wyam/LiveReload/ReloadClient.cs

@@ -35,9 +35,9 @@ public class ReloadClient : WebSocketConnection
 
         public override Task OnMessageReceived(ArraySegment<byte> message, WebSocketMessageType type)
         {
-            var json = Encoding.UTF8.GetString(message.Array, message.Offset, message.Count);
+            string json = Encoding.UTF8.GetString(message.Array, message.Offset, message.Count);
             HandleClientMessage(json);
-
+            
             return Task.CompletedTask;
         }
 
@@ -57,7 +57,7 @@ public override void OnClose(WebSocketCloseStatus? closeStatus, string closeStat
         public void NotifyOfChanges(string modifiedFile, bool supportCssReload = true)
         {
             // Asume changes have been rebuilt by this time
-            var reloadMessage = new ReloadMessage
+            ReloadMessage reloadMessage = new ReloadMessage
             {
                 Path = modifiedFile,
                 LiveCss = supportCssReload
@@ -69,15 +69,15 @@ public void NotifyOfChanges(string modifiedFile, bool supportCssReload = true)
 
         private ILiveReloadMessage HandleClientMessage(string json)
         {
-            var parsedMessage = JsonConvert.DeserializeObject<BasicMessage>(json, _defaultSettings);
+            BasicMessage parsedMessage = JsonConvert.DeserializeObject<BasicMessage>(json, _defaultSettings);
             switch (parsedMessage.Command)
             {
                 case "info":
-                    var info = JsonConvert.DeserializeObject<InfoMessage>(json, _defaultSettings);
-                    LogVerbose($"LiveReload sent info ({info.Url}).");
+                    InfoMessage info = JsonConvert.DeserializeObject<InfoMessage>(json, _defaultSettings);
+                    LogVerbose($"LiveReload client sent info ({info.Url}).");
                     break;
                 case "hello":
-                    var hello = JsonConvert.DeserializeObject<HelloMessage>(json, _defaultSettings);
+                    HelloMessage hello = JsonConvert.DeserializeObject<HelloMessage>(json, _defaultSettings);
                     HandleHello(hello);
                     break;
                 default:
@@ -90,14 +90,14 @@ private ILiveReloadMessage HandleClientMessage(string json)
 
         private void HandleHello(HelloMessage message)
         {
-            var negotiatedVersion = message.Protocols
+            string negotiatedVersion = message.Protocols
                                            .Intersect(_supportedVersion)
                                            .OrderByDescending(x => x)
                                            .FirstOrDefault();
 
             if (negotiatedVersion == null)
             {
-                var incompatibleMessage = "LiveReload client is not compatible with this server, aborting connection. " +
+                string incompatibleMessage = "LiveReload client is not compatible with this server, aborting connection. " +
                                           $"Client=({string.Join(",", message.Protocols)}) " +
                                           $"Server=({string.Join(",", _supportedVersion)})";
                 LogVerbose(incompatibleMessage);
@@ -112,7 +112,7 @@ private void HandleHello(HelloMessage message)
 
         private void SayHello()
         {
-            var helloMessage = new HelloMessage
+            HelloMessage helloMessage = new HelloMessage
             {
                 Protocols = _supportedVersion
             };
@@ -122,8 +122,8 @@ private void SayHello()
 
         private void SendObject<T>(T obj)
         {
-            var json = JsonConvert.SerializeObject(obj, _defaultSettings);
-            var bytes = Encoding.UTF8.GetBytes(json); // UTF-8 by spec
+            string json = JsonConvert.SerializeObject(obj, _defaultSettings);
+            byte[] bytes = Encoding.UTF8.GetBytes(json); // UTF-8 by spec
             SendText(bytes, true);
         }
 

src/clients/Wyam/LiveReload/ReloadClientServiceLocator.cs

@@ -36,7 +36,7 @@ public TService GetInstance<TService>()
         {
             if (typeof(TService) == typeof(ReloadClient))
             {
-                var client = CreateClient();
+                object client = CreateClient();
                 return (TService) client;
             }
 
@@ -55,7 +55,7 @@ public IEnumerable<TService> GetAllInstances<TService>()
 
         private object CreateClient()
         {
-            var client = new ReloadClient();
+            ReloadClient client = new ReloadClient();
             _clients.Add(client);
             return client;
         }

src/clients/Wyam/Owin/NullTraceOutputFactory.cs

@@ -0,0 +1,14 @@
+using System.IO;
+
+using Microsoft.Owin.Hosting.Tracing;
+
+namespace Wyam.Owin
+{
+    public class NullTraceOutputFactory : ITraceOutputFactory
+    {
+        public TextWriter Create(string outputFile)
+        {
+            return StreamWriter.Null;
+        }
+    }
+}

src/clients/Wyam/PreviewServer.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 
 using Microsoft.Owin;
@@ -90,13 +89,5 @@ public static IDisposable Start(DirectoryPath path, int port, bool forceExtensio
 
             return server;
         }
-
-        private class NullTraceOutputFactory : ITraceOutputFactory
-        {
-            public TextWriter Create(string outputFile)
-            {
-                return StreamWriter.Null;
-            }
-        }
     }
 }

src/clients/Wyam/Wyam.csproj

@@ -129,6 +129,7 @@
     <Compile Include="LiveReload\Messages\ILiveReloadMessage.cs" />
     <Compile Include="LiveReload\ReloadClient.cs" />
     <Compile Include="LiveReload\Messages\ReloadMessage.cs" />
+    <Compile Include="Owin\NullTraceOutputFactory.cs" />
     <Compile Include="Owin\VirtualDirectoryExtensions.cs" />
     <Compile Include="Owin\VirtualDirectoryMiddleware.cs" />
     <Compile Include="PreviewServer.cs" />