Minimal changes for .NET 6.0.

2022-09-14 17:53:28 +01:00
parent b7c59a94ab
commit 57eb8e3727
2 changed files with 99 additions and 130 deletions
--- a/Program.cs
+++ b/Program.cs
@@ -1,118 +1,96 @@
-using System;
-using System.Net.WebSockets;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Hosting.Server;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Http.Features;
-using Microsoft.AspNetCore.Server.Kestrel.Core;
-using Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets;
-using Microsoft.AspNetCore.WebSockets;
-using Microsoft.Extensions.Logging.Abstractions;
-using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Primitives;
-
-namespace Kestrel
-{
-    class Context
-    {
-        public IFeatureCollection features;
-
-        public Context(IFeatureCollection features)
-        {
-            this.features = features;
-        }
-    }
-
-    class Application : IHttpApplication<Context>
-    {
-        private WebSocketMiddleware wsMiddleware;
-
-        public Application()
-        {
-            var wsOptions = new WebSocketOptions();
-            wsMiddleware = new WebSocketMiddleware(continueRequest, new OptionsWrapper<WebSocketOptions>(wsOptions));
-        }
-
-        public Context CreateContext(IFeatureCollection contextFeatures)
-        {
-            return new Context(contextFeatures);
-        }
-
-        public void DisposeContext(Context context, Exception exception)
-        {
-        }
-
-        public async Task ProcessRequestAsync(Context context)
-        {
-            HttpContext httpContext = new DefaultHttpContext(context.features);
-            await wsMiddleware.Invoke(httpContext);
-        }
-
-        private async Task continueRequest(HttpContext httpContext)
-        {
-            if (httpContext.WebSockets.IsWebSocketRequest)
-            {
-                var socket = await httpContext.WebSockets.AcceptWebSocketAsync();
-                var message = Encoding.ASCII.GetBytes("hello world");
-                await socket.SendAsync(new ArraySegment<byte>(message), WebSocketMessageType.Text, true,
-                    CancellationToken.None);
-
-                await socket.ReceiveAsync(new byte[4096], CancellationToken.None);
-            }
-            else
-            {
-                httpContext.Response.Headers.Add("Content-Type", new StringValues("text/plain"));
-                await httpContext.Response.Body.WriteAsync(Encoding.ASCII.GetBytes("hello world"));
-            }
-        }
-    }
-
-    class ApplicationLifetime : IApplicationLifetime
-    {
-        private readonly CancellationTokenSource startedSource = new CancellationTokenSource();
-        private readonly CancellationTokenSource stoppingSource = new CancellationTokenSource();
-        private readonly CancellationTokenSource stoppedSource = new CancellationTokenSource();
-
-        public CancellationToken ApplicationStarted => startedSource.Token;
-
-        public CancellationToken ApplicationStopping => stoppingSource.Token;
-
-        public CancellationToken ApplicationStopped => stoppedSource.Token;
-
-        public void StopApplication()
-        {
-            lock (stoppingSource)
-            {
-                if (!stoppingSource.Token.IsCancellationRequested)
-                    stoppingSource.Cancel(throwOnFirstException: false);
-            }
-        }
-    }
-
-    class Program
-    {
-        static async Task Main(string[] args)
-        {
-            var serverOptions = new KestrelServerOptions();
-            serverOptions.ListenAnyIP(8080);
-
-            var transportOptions = new SocketTransportOptions();
-            var loggerFactory = new NullLoggerFactory();
-            var applicationLifetime = new ApplicationLifetime();
-
-            var transportFactory = new SocketTransportFactory(
-                new OptionsWrapper<SocketTransportOptions>(transportOptions), applicationLifetime, loggerFactory);
-
-            using (var server = new KestrelServer(new OptionsWrapper<KestrelServerOptions>(serverOptions),
-                transportFactory, loggerFactory))
-            {
-                await server.StartAsync(new Application(), CancellationToken.None);
-                Console.ReadLine();
-            }
-        }
-    }
-}
+using System;
+using System.Net.WebSockets;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting.Server;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Server.Kestrel.Core;
+using Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets;
+using Microsoft.AspNetCore.WebSockets;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Primitives;
+
+namespace Kestrel
+{
+    class Context
+    {
+        public IFeatureCollection features;
+
+        public Context(IFeatureCollection features)
+        {
+            this.features = features;
+        }
+    }
+
+    class Application : IHttpApplication<Context>
+    {
+        private WebSocketMiddleware wsMiddleware;
+
+        public Application(ILoggerFactory loggerFactory)
+        {
+            var wsOptions = new WebSocketOptions();
+            wsMiddleware = new WebSocketMiddleware(continueRequest, new OptionsWrapper<WebSocketOptions>(wsOptions),
+                loggerFactory);
+        }
+
+        public Context CreateContext(IFeatureCollection contextFeatures)
+        {
+            return new Context(contextFeatures);
+        }
+
+        public void DisposeContext(Context context, Exception exception)
+        {
+        }
+
+        public async Task ProcessRequestAsync(Context context)
+        {
+            HttpContext httpContext = new DefaultHttpContext(context.features);
+            await wsMiddleware.Invoke(httpContext);
+        }
+
+        private async Task continueRequest(HttpContext httpContext)
+        {
+            if (httpContext.WebSockets.IsWebSocketRequest)
+            {
+                var socket = await httpContext.WebSockets.AcceptWebSocketAsync();
+                var message = Encoding.ASCII.GetBytes("hello world");
+                await socket.SendAsync(new ArraySegment<byte>(message), WebSocketMessageType.Text, true,
+                    CancellationToken.None);
+
+                await socket.ReceiveAsync(new byte[4096], CancellationToken.None);
+            }
+            else
+            {
+                httpContext.Response.Headers.Add("Content-Type", new StringValues("text/plain"));
+                await httpContext.Response.Body.WriteAsync(Encoding.ASCII.GetBytes("hello world"));
+            }
+        }
+    }
+
+    class Program
+    {
+        static async Task Main(string[] args)
+        {
+            var serverOptions = new KestrelServerOptions();
+            serverOptions.ListenAnyIP(8080);
+
+            var transportOptions = new SocketTransportOptions();
+            var loggerFactory = new NullLoggerFactory();
+
+            var transportFactory = new SocketTransportFactory(
+                new OptionsWrapper<SocketTransportOptions>(transportOptions), loggerFactory);
+
+            using (var server = new KestrelServer(new OptionsWrapper<KestrelServerOptions>(serverOptions),
+                transportFactory, loggerFactory))
+            {
+                await server.StartAsync(new Application(loggerFactory), CancellationToken.None);
+                Console.ReadLine();
+            }
+        }
+    }
+}