From 07fc434cab51a1e322ee3e334ec0c8cb8f90d4ca Mon Sep 17 00:00:00 2001 From: Chris Ross Date: Wed, 18 Jun 2014 16:09:05 -0700 Subject: [PATCH] Cleanup sample, #regions, dependencies. --- samples/HelloWorld/Program.cs | 11 ++--- samples/SelfHostServer/project.json | 2 +- .../FeatureContext.cs | 40 +++++-------------- .../project.json | 4 +- src/Microsoft.Net.WebSockets/project.json | 2 +- 5 files changed, 19 insertions(+), 40 deletions(-) diff --git a/samples/HelloWorld/Program.cs b/samples/HelloWorld/Program.cs index 65336e9be3..3eb30c4f7e 100644 --- a/samples/HelloWorld/Program.cs +++ b/samples/HelloWorld/Program.cs @@ -19,13 +19,14 @@ using System; using System.Net.WebSockets; using System.Text; using System.Threading; +using System.Threading.Tasks; using Microsoft.Net.Server; namespace HelloWorld { public class Program { - public static void Main(string[] args) + public static async Task Main(string[] args) { using (WebListener listener = new WebListener()) { @@ -35,7 +36,7 @@ namespace HelloWorld Console.WriteLine("Running..."); while (true) { - RequestContext context = listener.GetContextAsync().Result; + RequestContext context = await listener.GetContextAsync(); Console.WriteLine("Accepted"); // Context: @@ -78,9 +79,9 @@ namespace HelloWorld if (context.IsWebSocketRequest) { Console.WriteLine("WebSocket"); - WebSocket webSocket = context.AcceptWebSocketAsync().Result; - webSocket.SendAsync(new ArraySegment(bytes, 0, bytes.Length), WebSocketMessageType.Text, true, CancellationToken.None).Wait(); - webSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, "Goodbye", CancellationToken.None).Wait(); + WebSocket webSocket = await context.AcceptWebSocketAsync(); + await webSocket.SendAsync(new ArraySegment(bytes, 0, bytes.Length), WebSocketMessageType.Text, true, CancellationToken.None); + await webSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, "Goodbye", CancellationToken.None); webSocket.Dispose(); } else diff --git a/samples/SelfHostServer/project.json b/samples/SelfHostServer/project.json index 002bc7304b..845c594e63 100644 --- a/samples/SelfHostServer/project.json +++ b/samples/SelfHostServer/project.json @@ -6,7 +6,7 @@ "Microsoft.AspNet.Server.WebListener": "", "Microsoft.Net.Server": "" }, - "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:8080" }, + "commands": { "web": "Microsoft.AspNet.Hosting --server=Microsoft.AspNet.Server.WebListener --server.urls=http://localhost:8080" }, "configurations": { "net45": { }, diff --git a/src/Microsoft.AspNet.Server.WebListener/FeatureContext.cs b/src/Microsoft.AspNet.Server.WebListener/FeatureContext.cs index 773f35e8ec..0a92682721 100644 --- a/src/Microsoft.AspNet.Server.WebListener/FeatureContext.cs +++ b/src/Microsoft.AspNet.Server.WebListener/FeatureContext.cs @@ -114,8 +114,6 @@ namespace Microsoft.AspNet.Server.WebListener */ } - #region IHttpRequestFeature - Stream IHttpRequestFeature.Body { get @@ -231,8 +229,7 @@ namespace Microsoft.AspNet.Server.WebListener } set { _scheme = value; } } - #endregion - #region IHttpConnectionFeature + bool IHttpConnectionFeature.IsLocal { get @@ -297,8 +294,7 @@ namespace Microsoft.AspNet.Server.WebListener } set { _remotePort = value; } } - #endregion - #region IHttpTransportLayerSecurityFeature + X509Certificate IHttpTransportLayerSecurityFeature.ClientCertificate { get @@ -319,8 +315,7 @@ namespace Microsoft.AspNet.Server.WebListener _clientCert = await Request.GetClientCertificateAsync(); } } - #endregion - #region IHttpResponseFeature + Stream IHttpResponseFeature.Body { get @@ -363,48 +358,33 @@ namespace Microsoft.AspNet.Server.WebListener get { return Response.StatusCode; } set { Response.StatusCode = value; } } - #endregion - #region IHttpSendFileFeature Task IHttpSendFileFeature.SendFileAsync(string path, long offset, long? length, CancellationToken cancellation) { return Response.SendFileAsync(path, offset, length, cancellation); } - #endregion - #region IHttpRequestLifetimeFeature - - public CancellationToken OnRequestAborted + CancellationToken IHttpRequestLifetimeFeature.OnRequestAborted { get { return _requestContext.DisconnectToken; } } - public void Abort() + void IHttpRequestLifetimeFeature.Abort() { _requestContext.Abort(); } - #endregion - #region IHttpOpaqueUpgradeFeature - - public bool IsUpgradableRequest + bool IHttpOpaqueUpgradeFeature.IsUpgradableRequest { get { return _requestContext.IsUpgradableRequest; } } - public Task UpgradeAsync() + Task IHttpOpaqueUpgradeFeature.UpgradeAsync() { - if (!IsUpgradableRequest) - { - throw new InvalidOperationException("This request cannot be upgraded."); - } return _requestContext.UpgradeAsync(); } - #endregion - #region IHttpWebSocketFeature - - public bool IsWebSocketRequest + bool IHttpWebSocketFeature.IsWebSocketRequest { get { @@ -412,7 +392,7 @@ namespace Microsoft.AspNet.Server.WebListener } } - public Task AcceptAsync(IWebSocketAcceptContext context) + Task IHttpWebSocketFeature.AcceptAsync(IWebSocketAcceptContext context) { // TODO: Advanced params string subProtocol = null; @@ -422,7 +402,5 @@ namespace Microsoft.AspNet.Server.WebListener } return _requestContext.AcceptWebSocketAsync(subProtocol); } - - #endregion } } diff --git a/src/Microsoft.AspNet.Server.WebListener/project.json b/src/Microsoft.AspNet.Server.WebListener/project.json index e7840b9642..44d1db4f1c 100644 --- a/src/Microsoft.AspNet.Server.WebListener/project.json +++ b/src/Microsoft.AspNet.Server.WebListener/project.json @@ -7,7 +7,8 @@ "Microsoft.AspNet.HttpFeature": "0.1-alpha-*", "Microsoft.Framework.ConfigurationModel": "0.1-alpha-*", "Microsoft.Framework.Logging": "0.1-alpha-*", - "Microsoft.Net.Server" : "" + "Microsoft.Net.Server" : "", + "Microsoft.Net.WebSocketAbstractions": "0.1-alpha-*" }, "compilationOptions": { "allowUnsafe": true @@ -16,7 +17,6 @@ "net45": {}, "k10": { "dependencies": { - "Microsoft.Net.WebSocketAbstractions": "0.1-alpha-*", "Microsoft.Win32.Primitives": "4.0.0.0", "System.Collections": "4.0.0.0", "System.Collections.Concurrent": "4.0.0.0", diff --git a/src/Microsoft.Net.WebSockets/project.json b/src/Microsoft.Net.WebSockets/project.json index c3b93c599f..12505a3def 100644 --- a/src/Microsoft.Net.WebSockets/project.json +++ b/src/Microsoft.Net.WebSockets/project.json @@ -1,13 +1,13 @@ { "version": "0.1-alpha-*", "dependencies": { + "Microsoft.Net.WebSocketAbstractions": "0.1-alpha-*" }, "compilationOptions" : { "allowUnsafe": true }, "configurations": { "net45" : { }, "k10" : { "dependencies": { - "Microsoft.Net.WebSocketAbstractions": "0.1-alpha-*", "Microsoft.Win32.Primitives": "4.0.0.0", "System.Collections": "4.0.0.0", "System.Collections.Concurrent": "4.0.0.0",