Merge pull request #34 from aspnet/yalyu/MappingContinue

Url match used for Dot Net Core project connection

Author: Yang Lyu

src/Microsoft.VisualStudio.Web.BrowserLink/BrowserLinkMiddleWare.cs

@@ -37,17 +37,18 @@ internal BrowserLinkMiddleware(string applicationPath, RequestDelegate next)
         internal Task Invoke(HttpContext context)
         {
             string requestId = Guid.NewGuid().ToString("N");
+            RequestHeaders requestHeader = new RequestHeaders(context.Request.Headers);
 
-            IHttpSocketAdapter injectScriptSocket = GetSocketConnectionToHost(_applicationPath, requestId, "injectScriptLink", context.Request.IsHttps);
+            string hostUrl = BrowserLinkMiddleWareUtil.GetRequestUrl(requestHeader);
 
+            IHttpSocketAdapter injectScriptSocket = GetSocketConnectionToHost(_applicationPath, requestId, "injectScriptLink", context.Request.IsHttps, hostUrl);
+                       
             if (injectScriptSocket != null)
             {
                 return ExecuteWithFilter(injectScriptSocket, requestId, context);
             }
             else
             {
-                RequestHeaders requestHeader = new RequestHeaders(context.Request.Headers); 
-
                 if (requestHeader.IfNoneMatch != null && BrowserLinkMiddleWareUtil.GetRequestPort(requestHeader).Count != 0)
                 {
                     BrowserLinkMiddleWareUtil.RemoveETagAndTimeStamp(requestHeader);
@@ -59,7 +60,11 @@ internal Task Invoke(HttpContext context)
 
         private PageExecutionListenerFeature AddPageExecutionListenerFeatureTo(HttpContext context, string requestId)
         {
-            IHttpSocketAdapter mappingDataSocket = GetSocketConnectionToHost(_applicationPath, requestId, "sendMappingData", context.Request.IsHttps);
+            RequestHeaders requestHeader = new RequestHeaders(context.Request.Headers);
+
+            string hostUrl = BrowserLinkMiddleWareUtil.GetRequestUrl(requestHeader);
+
+            IHttpSocketAdapter mappingDataSocket = GetSocketConnectionToHost(_applicationPath, requestId, "sendMappingData", context.Request.IsHttps, hostUrl);
 
             if (mappingDataSocket != null)
             {
@@ -126,7 +131,7 @@ private Task ExecuteWithoutFilter(HttpContext context)
             return _next(context);
         }
 
-        private static IHttpSocketAdapter GetSocketConnectionToHost(string applicationPath, string requestId, string rpcMethod, bool isHttps)
+        private static IHttpSocketAdapter GetSocketConnectionToHost(string applicationPath, string requestId, string rpcMethod, bool isHttps, string hostUrl)
         {
             // The host should send an initial response immediately after
             // the connection is established. If it fails to do so multiple times,
@@ -148,7 +153,7 @@ private static IHttpSocketAdapter GetSocketConnectionToHost(string applicationPa
                     {
                         IHttpSocketAdapter httpSocket = await HttpSocketAdapter.OpenHttpSocketAsync("GET", new Uri(connectionString, rpcMethod));
 
-                        AddRequestHeaders(httpSocket, requestId, isHttps);
+                        AddRequestHeaders(httpSocket, requestId, isHttps, hostUrl);
 
                         return httpSocket;
                     }
@@ -160,7 +165,7 @@ private static IHttpSocketAdapter GetSocketConnectionToHost(string applicationPa
             return null;
         }
 
-        private static void AddRequestHeaders(IHttpSocketAdapter httpSocket, string requestId, bool isHttps)
+        private static void AddRequestHeaders(IHttpSocketAdapter httpSocket, string requestId, bool isHttps, string hostUrl)
         {
             httpSocket.AddRequestHeader(BrowserLinkConstants.RequestIdHeaderName, requestId);
 
@@ -172,6 +177,8 @@ private static void AddRequestHeaders(IHttpSocketAdapter httpSocket, string requ
             {
                 httpSocket.AddRequestHeader(BrowserLinkConstants.RequestScheme, "http");
             }
+
+            httpSocket.AddRequestHeader(BrowserLinkConstants.RequestHostUrl, hostUrl);
         }
 
         private static bool FindAndSignalHostConnection(string applicationPath)

src/Microsoft.VisualStudio.Web.BrowserLink/BrowserLinkMiddleWareUtil.cs

@@ -32,6 +32,11 @@ internal static List<int> GetRequestPort(RequestHeaders requestHeader)
             return requestPortList;
         }
 
+        internal static string GetRequestUrl(RequestHeaders requstHeader)
+        {
+            return requstHeader.Host.ToString();
+        }
+
         internal static int GetCurrentPort(string connectionString)
         {
             Uri uri;

src/Microsoft.VisualStudio.Web.BrowserLink/Common/ArteryConstants.cs

@@ -48,6 +48,11 @@ internal static class BrowserLinkConstants
         /// </summary>
         public const string RequestScheme = "Scheme";
 
+        /// <summary>
+        /// The url of the host used for project match.
+        /// </summary>
+        public const string RequestHostUrl = "HostUrl";
+
         /// <summary>
         /// Suffix added to the end of the instance file name to identify a
         /// Version 2 instance file