Upgrade to JSPool 0.3 and use its file watching

Author: Daniel15

src/React.Core/JavaScriptEngineFactory.cs

@@ -2,7 +2,6 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
 using System.Linq;
 using System.Threading;
 using JavaScriptEngineSwitcher.Core;
@@ -40,28 +39,10 @@ protected readonly ConcurrentDictionary<int, IJsEngine> _engines
 		/// </summary>
 		protected IJsPool _pool;
 		/// <summary>
-		/// Used to recycle the JavaScript engine pool when relevant JavaScript files are modified.
-		/// </summary>
-		protected readonly FileSystemWatcher _watcher;
-		/// <summary>
-		/// Names of all the files that are loaded into the JavaScript engine. If any of these 
-		/// files are changed, the engines should be recycled
-		/// </summary>
-		protected readonly ISet<string> _watchedFiles;
-		/// <summary>
-		/// Timer for debouncing pool recycling
-		/// </summary>
-		protected readonly Timer _resetPoolTimer;
-		/// <summary>
 		/// Whether this class has been disposed.
 		/// </summary>
 		protected bool _disposed;
 
-		/// <summary>
-		/// Time period to debounce file system changed events, in milliseconds.
-		/// </summary>
-		protected const int DEBOUNCE_TIMEOUT = 25;
-
 		/// <summary>
 		/// Initializes a new instance of the <see cref="JavaScriptEngineFactory"/> class.
 		/// </summary>
@@ -77,32 +58,6 @@ IFileSystem fileSystem
 			if (_config.ReuseJavaScriptEngines)
 			{
 				_pool = CreatePool();
-				_resetPoolTimer = new Timer(OnResetPoolTimer);
-
-				var allFiles = _config.Scripts.Concat(_config.ScriptsWithoutTransform);
-				_watchedFiles = new HashSet<string>(allFiles.Select(
-					fileName => _fileSystem.MapPath(fileName).ToLowerInvariant()
-				));
-				try
-				{
-					// Attempt to initialise a FileSystemWatcher so we can recycle the JavaScript
-					// engine pool when files are changed.
-					_watcher = new FileSystemWatcher
-					{
-						Path = _fileSystem.MapPath("~"),
-						IncludeSubdirectories = true,
-						EnableRaisingEvents = true,
-					};
-					_watcher.Changed += OnFileChanged;
-					_watcher.Created += OnFileChanged;
-					_watcher.Deleted += OnFileChanged;
-					_watcher.Renamed += OnFileChanged;
-				}
-				catch (Exception ex)
-				{
-					// Can't use FileSystemWatcher (eg. not running in Full Trust)
-					Trace.WriteLine("Unable to initialise FileSystemWatcher: " + ex.Message);
-				}
 			}
 		}
 
@@ -111,10 +66,16 @@ IFileSystem fileSystem
 		/// </summary>
 		protected virtual IJsPool CreatePool()
 		{
+			var allFiles = _config.Scripts
+				.Concat(_config.ScriptsWithoutTransform)
+				.Select(_fileSystem.MapPath);
+
 			var poolConfig = new JsPoolConfig
 			{
 				EngineFactory = _factory,
 				Initializer = InitialiseEngine,
+				WatchPath = _fileSystem.MapPath("~/"),
+				WatchFiles = allFiles
 			};
 			if (_config.MaxEngines != null)
 			{
@@ -337,36 +298,6 @@ public virtual void Dispose()
 			}
 		}
 
-		/// <summary>
-		/// Handles events fired when any files are changed.
-		/// </summary>
-		/// <param name="sender">The sender</param>
-		/// <param name="args">The <see cref="FileSystemEventArgs"/> instance containing the event data</param>
-		protected virtual void OnFileChanged(object sender, FileSystemEventArgs args)
-		{
-			if (_watchedFiles.Contains(args.FullPath.ToLowerInvariant()))
-			{
-				// Use a timer so multiple changes only result in a single reset.
-				_resetPoolTimer.Change(DEBOUNCE_TIMEOUT, Timeout.Infinite);
-			}
-		}
-
-		/// <summary>
-		/// Called when any of the watched files have changed. Recycles the JavaScript engine pool
-		/// so the files are all reloaded.
-		/// </summary>
-		/// <param name="state">Unused</param>
-		protected virtual void OnResetPoolTimer(object state)
-		{
-			// Create the new pool before disposing the old pool so that _pool is never null.
-			var oldPool = _pool;
-			_pool = CreatePool();
-			if (oldPool != null)
-			{
-				oldPool.Dispose();
-			}
-		}
-
 		/// <summary>
 		/// Ensures that this object has not been disposed.
 		/// </summary>

src/React.Core/React.Core.csproj

@@ -60,9 +60,9 @@
     <Reference Include="JavaScriptEngineSwitcher.V8">
       <HintPath>..\packages\JavaScriptEngineSwitcher.V8.1.2.4\lib\net40\JavaScriptEngineSwitcher.V8.dll</HintPath>
     </Reference>
-    <Reference Include="JSPool, Version=0.2.0.0, Culture=neutral, PublicKeyToken=2fc7775f73072640, processorArchitecture=MSIL">
+    <Reference Include="JSPool, Version=0.3.0.0, Culture=neutral, PublicKeyToken=2fc7775f73072640, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\JSPool.0.2.0\lib\net40-Client\JSPool.dll</HintPath>
+      <HintPath>..\packages\JSPool.0.3.0\lib\net40-Client\JSPool.dll</HintPath>
     </Reference>
     <Reference Include="MsieJavaScriptEngine, Version=1.5.1.0, Culture=neutral, PublicKeyToken=a3a2846a37ac0d3e, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

src/React.Core/packages.config

@@ -3,7 +3,7 @@
   <package id="JavaScriptEngineSwitcher.Core" version="1.2.4" targetFramework="net40" />
   <package id="JavaScriptEngineSwitcher.Msie" version="1.2.4" targetFramework="net40" />
   <package id="JavaScriptEngineSwitcher.V8" version="1.2.4" targetFramework="net40" />
-  <package id="JSPool" version="0.2.0" targetFramework="net40" />
+  <package id="JSPool" version="0.3.0" targetFramework="net40" />
   <package id="MsieJavaScriptEngine" version="1.5.1" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net40" />
 </packages>

src/wrap/React.Core/project.json

@@ -10,7 +10,7 @@
       "dependencies": {
         "JavaScriptEngineSwitcher.Core": "1.2.4",
         "JavaScriptEngineSwitcher.V8": "1.2.4",
-        "JSPool": "0.2.0",
+        "JSPool": "0.3.0",
         "Newtonsoft.Json": "5.0.4",
         "VroomJs": "1.0.0-*",
         "JavaScriptEngineSwitcher.Msie": "1.2.4",

src/wrap/React/project.json

@@ -10,8 +10,8 @@
       "dependencies": {
         "JavaScriptEngineSwitcher.Core": "1.2.4",
         "JavaScriptEngineSwitcher.V8": "1.2.4",
-        "JSPool": "0.2.0",
-        "Newtonsoft.Json": "5.0.4",
+        "JSPool": "0.3.0",
+        "Newtonsoft.Json": "6.0.8",
         "VroomJs": "1.0.0-*",
         "JavaScriptEngineSwitcher.Msie": "1.2.4",
         "MsieJavaScriptEngine": "1.5.1"