Update OWIN JSX middleware so it can run on ASP.NET 5 as well. References #47

Author: Daniel15

src/React.AspNet5/AspNet5FileSystem.cs

@@ -18,7 +18,6 @@ namespace React.AspNet5
 	/// </summary>
 	public class AspNet5FileSystem : FileSystemBase
 	{
-		private const string PREFIX = "~/";
 		private readonly IApplicationEnvironment _appEnvironment;
 
 		/// <summary>
@@ -37,10 +36,7 @@ public AspNet5FileSystem(IApplicationEnvironment appEnvironment)
 		/// <returns>Full path of the file</returns>
 		public override string MapPath(string relativePath)
 		{
-			if (relativePath.StartsWith(PREFIX))
-			{
-				relativePath = relativePath.Substring(PREFIX.Length);
-			}
+			relativePath = relativePath.TrimStart('~').TrimStart('/');
 			return Path.Combine(_appEnvironment.ApplicationBasePath, relativePath);
 		}
 	}

src/React.AspNet5/AssemblyRegistration.cs

@@ -24,8 +24,7 @@ public class AssemblyRegistration : IAssemblyRegistration
 		public void Register(TinyIoCContainer container)
 		{
 			container.Register<IFileSystem, AspNet5FileSystem>().AsSingleton();
-			// TODO: Caching for ASP.NET 5
-			container.Register<ICache, NullCache>().AsSingleton();
+			container.Register<ICache, MemoryFileCache>().AsSingleton();
 		}
 	}
 }

src/React.AspNet5/JsxFileMiddleware.cs

@@ -0,0 +1,97 @@
+/*
+ *  Copyright (c) 2015, Facebook, Inc.
+ *  All rights reserved.
+ *
+ *  This source code is licensed under the BSD-style license found in the
+ *  LICENSE file in the root directory of this source tree. An additional grant 
+ *  of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNet.Builder;
+using Microsoft.AspNet.Hosting;
+using Microsoft.AspNet.Http;
+using Microsoft.AspNet.StaticFiles;
+using Microsoft.Framework.Logging;
+
+namespace React.AspNet5
+{
+	/// <summary>
+	/// Enables serving static JSX files transformed to pure JavaScript. Wraps around StaticFileMiddleware.
+	/// </summary>
+	public class JsxFileMiddleware
+	{
+		private readonly RequestDelegate _next;
+		private readonly IHostingEnvironment _hostingEnv;
+		private readonly ILoggerFactory _loggerFactory;
+		private readonly JsxFileOptions _options;
+
+		/// <summary>
+		/// Creates a new instance of the JsxFileMiddleware.
+		/// </summary>
+		/// <param name="next">The next middleware in the pipeline.</param>
+		/// <param name="options">The configuration options.</param>
+		/// <param name="hostingEnv">The hosting environment.</param>
+		/// <param name="loggerFactory">An <see cref="ILoggerFactory"/> instance used to create loggers.</param>
+		public JsxFileMiddleware(RequestDelegate next, JsxFileOptions options, IHostingEnvironment hostingEnv, ILoggerFactory loggerFactory)
+		{
+			if (next == null)
+				throw new ArgumentNullException("next");
+
+			_next = next;
+			_hostingEnv = hostingEnv;
+			_loggerFactory = loggerFactory;
+
+			// Default values
+			_options = options ?? new JsxFileOptions();
+		}
+
+		/// <summary>
+		/// Processes a request to determine if it matches a known JSX file, and if so, serves it compiled to JavaScript.
+		/// </summary>
+		/// <param name="context">ASP.NET HTTP context</param>
+		public async Task Invoke(HttpContext context)
+		{
+			if (!context.Request.Path.HasValue || !_options.Extensions.Any(context.Request.Path.Value.EndsWith))
+			{
+				// Not a request for a JSX file, so just pass through to the next middleware
+				await _next(context);
+				return;
+			}
+
+			var reactEnvironment = React.AssemblyRegistration.Container.Resolve<IReactEnvironment>();
+			var internalStaticMiddleware = CreateFileMiddleware(reactEnvironment.JsxTransformer);
+			await internalStaticMiddleware.Invoke(context);
+		}
+
+		/// <summary>
+		/// Creates the internal <see cref="StaticFileMiddleware"/> used to serve JSX files.
+		/// </summary>
+		/// <param name="jsxTransformer"></param>
+		/// <returns></returns>
+		private StaticFileMiddleware CreateFileMiddleware(IJsxTransformer jsxTransformer)
+		{
+			return new StaticFileMiddleware(
+				_next,
+				_hostingEnv,
+				new StaticFileOptions
+				{
+					ContentTypeProvider = _options.StaticFileOptions.ContentTypeProvider,
+					DefaultContentType = _options.StaticFileOptions.DefaultContentType,
+					OnPrepareResponse = _options.StaticFileOptions.OnPrepareResponse,
+					RequestPath = _options.StaticFileOptions.RequestPath,
+					ServeUnknownFileTypes = _options.StaticFileOptions.ServeUnknownFileTypes,
+					FileSystem = new JsxFileSystem(
+						jsxTransformer, 
+						_options.StaticFileOptions.FileSystem ?? _hostingEnv.WebRootFileSystem,
+						_options.Extensions
+					)
+				},
+				_loggerFactory
+			);
+		}
+	}
+}
+ 

src/React.Owin/JsxFileOptions.cs renamed to src/React.AspNet5/JsxFileOptions.cs

@@ -8,10 +8,17 @@
  */
 
 using System.Collections.Generic;
-
+#if OWIN
 using Microsoft.Owin.StaticFiles;
+#else
+using Microsoft.AspNet.StaticFiles;
+#endif
 
+#if OWIN
 namespace React.Owin
+#else
+namespace React.AspNet5
+#endif
 {
 	/// <summary>
 	/// Options for serving JSX files.
@@ -27,5 +34,14 @@ public class JsxFileOptions
 		/// Options for static file middleware used to server JSX files.
 		/// </summary>
 		public StaticFileOptions StaticFileOptions { get; set; }
+
+		/// <summary>
+		/// Creates a new instance of the <see cref="JsxFileOptions"/> class.
+		/// </summary>
+		public JsxFileOptions()
+		{
+			Extensions = new[] { ".jsx", ".js" };
+			StaticFileOptions = new StaticFileOptions();
+		}
 	}
 }

src/React.AspNet5/ReactServiceCollectionExtensions.cs

@@ -33,8 +33,13 @@ public static IServiceCollection AddReact(this IServiceCollection services)
 		/// </summary>
 		/// <param name="app">ASP.NET application builder</param>
 		/// <param name="configure">ReactJS.NET configuration</param>
+		/// <param name="fileOptions">Options to use for serving JSX files</param>
 		/// <returns>The application builder (for chaining)</returns>
-		public static IApplicationBuilder UseReact(this IApplicationBuilder app, Action<IReactSiteConfiguration> configure)
+		public static IApplicationBuilder UseReact(
+			this IApplicationBuilder app, 
+			Action<IReactSiteConfiguration> configure,
+			JsxFileOptions fileOptions = null
+		)
 		{
 			// Register IApplicationEnvironment in our dependency injection container
 			// Ideally this would be in AddReact(IServiceCollection) but we can't 
@@ -43,6 +48,10 @@ public static IApplicationBuilder UseReact(this IApplicationBuilder app, Action<
 
 			Initializer.Initialize(registerOptions => AsPerRequestSingleton(app.ApplicationServices, registerOptions));
 			configure(ReactSiteConfiguration.Configuration);
+
+			// Allow serving of .jsx files
+			app.UseMiddleware<JsxFileMiddleware>(fileOptions ?? new JsxFileOptions());
+
 			return app;
 		}
 

src/React.AspNet5/project.json

@@ -1,9 +1,23 @@
 {
     "version": "1.3.1-*",
+    "configurations": {
+        "Debug": {
+            "compilationOptions": {
+                "define": ["DEBUG", "TRACE", "ASPNET5"]
+            }
+        },
+        "Release": {
+            "compilationOptions": {
+                "define": ["RELEASE", "TRACE", "ASPNET5"],
+                "optimize": true
+            }
+        },
+    },
     "dependencies": {
         "Microsoft.Framework.DependencyInjection": "1.0.0.0-beta2",
         "Microsoft.AspNet.Hosting": "1.0.0.0-beta2",
         "Microsoft.AspNet.Mvc.Core": "6.0.0.0-beta2",
+        "Microsoft.AspNet.StaticFiles": "1.0.0.0-beta2",
         "React": ""
     },
 

src/React.Owin/JsxFileMiddleware.cs

@@ -9,7 +9,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 
 using Microsoft.Owin.StaticFiles;
@@ -22,8 +21,7 @@ namespace React.Owin
 	public class JsxFileMiddleware
 	{
 		private readonly Func<IDictionary<string, object>, Task> _next;
-		private readonly StaticFileOptions _fileOptions;
-		private readonly IEnumerable<string> _extensions;
+		private readonly JsxFileOptions _options;
 
 		static JsxFileMiddleware()
 		{
@@ -44,9 +42,7 @@ public JsxFileMiddleware(Func<IDictionary<string, object>, Task> next, JsxFileOp
 			_next = next;
 
 			// Default values
-			options = options ?? new JsxFileOptions();
-			_extensions = (options.Extensions == null || !options.Extensions.Any()) ? new[] { ".jsx", ".js" } : options.Extensions;
-			_fileOptions = options.StaticFileOptions ?? new StaticFileOptions();
+			_options = options ?? new JsxFileOptions();
 		}
 
 		/// <summary>
@@ -68,18 +64,27 @@ public async Task Invoke(IDictionary<string, object> environment)
 				disposable.Dispose();
 		}
 
+		/// <summary>
+		/// Creates the internal <see cref="StaticFileMiddleware"/> used to serve JSX files.
+		/// </summary>
+		/// <param name="jsxTransformer"></param>
+		/// <returns></returns>
 		private StaticFileMiddleware CreateFileMiddleware(IJsxTransformer jsxTransformer)
 		{
 			return new StaticFileMiddleware(
 				_next,
 				new StaticFileOptions()
 				{
-					ContentTypeProvider = _fileOptions.ContentTypeProvider,
-					DefaultContentType = _fileOptions.DefaultContentType,
-					OnPrepareResponse = _fileOptions.OnPrepareResponse,
-					RequestPath = _fileOptions.RequestPath,
-					ServeUnknownFileTypes = _fileOptions.ServeUnknownFileTypes,
-					FileSystem = new JsxFileSystem(jsxTransformer, _fileOptions.FileSystem, _extensions)
+					ContentTypeProvider = _options.StaticFileOptions.ContentTypeProvider,
+					DefaultContentType = _options.StaticFileOptions.DefaultContentType,
+					OnPrepareResponse = _options.StaticFileOptions.OnPrepareResponse,
+					RequestPath = _options.StaticFileOptions.RequestPath,
+					ServeUnknownFileTypes = _options.StaticFileOptions.ServeUnknownFileTypes,
+					FileSystem = new JsxFileSystem(
+						jsxTransformer, 
+						_options.StaticFileOptions.FileSystem, 
+						_options.Extensions
+					)
 				});
 		}
 	}