Resolve some previous issues

Author: Yang Lyu

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

@@ -25,8 +25,6 @@ internal class BrowserLinkMiddleware
         private RequestDelegate _next;
         private string _applicationPath;
 
-        private static string _hostUrl;
-
         internal BrowserLinkMiddleware(string applicationPath, RequestDelegate next)
         {
             _applicationPath = applicationPath;
@@ -39,20 +37,18 @@ internal BrowserLinkMiddleware(string applicationPath, RequestDelegate next)
         internal Task Invoke(HttpContext context)
         {
             string requestId = Guid.NewGuid().ToString("N");
-
-            IHttpSocketAdapter injectScriptSocket = GetSocketConnectionToHost(_applicationPath, requestId, "injectScriptLink", context.Request.IsHttps);
             RequestHeaders requestHeader = new RequestHeaders(context.Request.Headers);
 
-            _hostUrl = BrowserLinkMiddleWareUtil.GetRequestUrl(requestHeader);
-            
+            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);
@@ -64,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)
             {
@@ -131,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,
@@ -153,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;
                     }
@@ -165,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);
 
@@ -178,8 +178,7 @@ private static void AddRequestHeaders(IHttpSocketAdapter httpSocket, string requ
                 httpSocket.AddRequestHeader(BrowserLinkConstants.RequestScheme, "http");
             }
 
-            httpSocket.AddRequestHeader(BrowserLinkConstants.RequestTest, "testValue");
-            httpSocket.AddRequestHeader(BrowserLinkConstants.RequestHostUrl, _hostUrl);
+            httpSocket.AddRequestHeader(BrowserLinkConstants.RequestHostUrl, hostUrl);
         }
 
         private static bool FindAndSignalHostConnection(string applicationPath)

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

@@ -48,8 +48,9 @@ internal static class BrowserLinkConstants
         /// </summary>
         public const string RequestScheme = "Scheme";
 
-        public const string RequestTest = "TestKey";
-
+        /// <summary>
+        /// The url of the host used for project match.
+        /// </summary>
         public const string RequestHostUrl = "HostUrl";
 
         /// <summary>