Release: 1.0.9 (#17)

release: 1.0.9

SimpleTcp/Server/BaseTcpServer.cs

@@ -81,7 +81,7 @@ public IClient[] Clients
         /// <param name="port">If you specify a valid port, the server starts immediately.</param>
         public BaseTcpServer(int port = -1)
         {
-            if (port > 0)
+            if (port >= 0)
             {
                 Start(port);
             }

SimpleTcp/Server/Http/HttpResponse.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Text;
 
 namespace SimpleTcp.Server.Http
@@ -13,17 +14,59 @@ public class HttpResponse : IHttpResponse
         #region Properties
         public int StatusCode { get; set; }
         public string ReasonPhrase { get; set; }
-        public byte[] Content { get; set; }
-        public HttpHeaders Headers { get; private set; }
+
+        private byte[] _content;
+        public byte[] Content
+        {
+            get => _content;
+            set
+            {
+                if(_content == null && _contentStream == null )
+                {
+                    _content = value;
+                }
+                else
+                {
+                    throw new InvalidOperationException("content is already set");
+                }
+            }
+        }
+
+        public HttpHeaders Headers { get; private set; } = new HttpHeaders();
+        #endregion
+
+        #region Private Members
+        private Stream _contentStream;
+        private bool _leaveOpen;
         #endregion
 
         #region Public Methods
         public HttpResponse()
         {
-            Headers = new HttpHeaders();
+            _contentStream = null;
         }
 
-        public HttpResponse(HttpStatusCode httpStatusCode) : this()
+        public HttpResponse(Stream contentStream, bool leaveOpen = false)
+        {
+            _contentStream = contentStream;
+            _leaveOpen = leaveOpen;
+        }
+
+        public HttpResponse(string filePath, string contentType) : this(new FileStream(filePath, FileMode.Open, FileAccess.Read))
+        {
+            SetHttpStatusCode(HttpStatusCode.OK);
+            if(!string.IsNullOrWhiteSpace(contentType))
+            {
+                Headers["content-type"] = contentType;
+            }
+        }
+
+        public HttpResponse(HttpStatusCode httpStatusCode, Stream contentStream = null, bool leaveOpen = false) : this(contentStream, leaveOpen)
+        {
+            SetHttpStatusCode(httpStatusCode);
+        }
+
+        public void SetHttpStatusCode(HttpStatusCode httpStatusCode)
         {
             StatusCode = (int)httpStatusCode;
             #region SetReasonPhrase
@@ -158,6 +201,32 @@ public HttpResponse(HttpStatusCode httpStatusCode) : this()
             }
             #endregion
         }
+
+        public Stream GetContentStream()
+        {
+            if(_contentStream != null)
+            {
+                return _contentStream;
+            }
+            else if(Content != null)
+            {
+                _contentStream = new MemoryStream(Content);
+                _leaveOpen = false;
+                return _contentStream;
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+        public void Dispose()
+        {
+            if(!_leaveOpen)
+            {
+                _contentStream?.Close();
+            }
+        }
         #endregion
     }
 

SimpleTcp/Server/Http/HttpServer.cs

@@ -57,10 +57,11 @@ protected override void OnDataReceived(IClient client, int receivedSize)
             {
                 if(httpRequest.Process(client))
                 {
-                    HttpResponse httpResponse = HttpRequest?.Invoke(this, new HttpRequestEventArgs(httpRequest));
+                    IHttpResponse httpResponse = HttpRequest?.Invoke(this, new HttpRequestEventArgs(httpRequest));
                     if(httpResponse != null)
                     {
                         WriteHttpResponse(httpResponse, client);
+                        httpResponse.Dispose();
                     }
                     client.Disconnect();
                     break;
@@ -85,21 +86,29 @@ protected override void OnClientDisconnected(IClient client)
         #endregion
 
         #region Private Methods
-        private void WriteHttpResponse(HttpResponse httpResponse, IClient client)
+        private void WriteHttpResponse(IHttpResponse httpResponse, IClient client)
         {
             if(!httpResponse.Headers.ContainsKey("content-type"))
             {
                 httpResponse.Headers.Add("content-type", "text/html");
             }
-            httpResponse.Headers["content-length"] = $"{httpResponse.Content?.Length ?? 0}";
+
+            Stream contentStream = httpResponse.GetContentStream();
+            httpResponse.Headers["content-length"] = $"{contentStream?.Length ?? 0}";
 
             WriteText(client, $"HTTP/1.1 {httpResponse.StatusCode} {httpResponse.ReasonPhrase}\r\n");
             WriteText(client, httpResponse.Headers.ToString());
             WriteText(client, "\r\n\r\n"); // end
 
-            if(httpResponse.Content != null && httpResponse.Content.Length > 0)
+            if(contentStream?.Length > 0)
             {
-                client.Write(httpResponse.Content, 0, httpResponse.Content.Length);
+                byte[] buffer = new byte[1024 * 4];
+
+                int readBytes;
+                while((readBytes = contentStream.Read(buffer, 0, buffer.Length)) > 0)
+                {
+                    client.Write(buffer, 0, readBytes);
+                }
             }
         }
 

SimpleTcp/Server/Http/HttpServerEvent.cs

@@ -13,5 +13,5 @@ public HttpRequestEventArgs(IHttpRequest httpRequest)
             Request = httpRequest;
         }
     }
-    public delegate HttpResponse HttpRequestEventHandler(object sender, HttpRequestEventArgs e);
+    public delegate IHttpResponse HttpRequestEventHandler(object sender, HttpRequestEventArgs e);
 }

SimpleTcp/Server/Http/IHttpResponse.cs

@@ -1,10 +1,15 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Text;
 
 namespace SimpleTcp.Server.Http
 {
-    public interface IHttpResponse
+    public interface IHttpResponse : IDisposable
     {
+        int StatusCode { get; }
+        string ReasonPhrase { get; }
+        HttpHeaders Headers { get; }
+        Stream GetContentStream();
     }
 }

SimpleTcp/SimpleTcp.csproj

@@ -8,10 +8,10 @@
     <PackageProjectUrl>https://github.com/akon47/SimpleTcp</PackageProjectUrl>
     <RepositoryUrl>https://github.com/akon47/SimpleTcp</RepositoryUrl>
     <PackageTags>SimpleTcp Tcp Client Server Socket</PackageTags>
-    <PackageReleaseNotes>Added Http Server function.</PackageReleaseNotes>
-    <AssemblyVersion>1.0.8.0</AssemblyVersion>
-    <FileVersion>1.0.8.0</FileVersion>
-    <Version>1.0.8</Version>
+    <PackageReleaseNotes>Improved the ability to return large files from Http servers.</PackageReleaseNotes>
+    <AssemblyVersion>1.0.9.0</AssemblyVersion>
+    <FileVersion>1.0.9.0</FileVersion>
+    <Version>1.0.9</Version>
     <PackageIcon>logo.png</PackageIcon>
     <PackageIconUrl />
     <Authors>Kim Hwan</Authors>

Tests/UnitTestProject/PacketTcpServerClientTest.cs

@@ -17,7 +17,7 @@ public void ServerClientTest()
             var packetTcpServer = new PacketTcpServer();
             Assert.IsFalse(packetTcpServer.IsStarted);
 
-            packetTcpServer.Start(5005);
+            packetTcpServer.Start(0);
             Assert.IsTrue(packetTcpServer.IsStarted, "PacketTcpServer is started by start function");
 
             Assert.IsTrue(packetTcpServer.Clients.Length == 0);
@@ -26,7 +26,7 @@ public void ServerClientTest()
             for(int i = 0; i < 25; i++)
             {
                 var packetTcpClient = new PacketTcpClient();
-                packetTcpClient.Connect("localhost", 5005);
+                packetTcpClient.Connect("localhost", packetTcpServer.Port);
                 Assert.IsTrue(packetTcpClient.IsConnected);
                 packetTcpClients.Add(packetTcpClient);
             }
@@ -37,7 +37,7 @@ public void ServerClientTest()
 
             for (int i = 0; i < 25; i++)
             {
-                var packetTcpClient = new PacketTcpClient("localhost", 5005);
+                var packetTcpClient = new PacketTcpClient("localhost", packetTcpServer.Port);
                 Assert.IsTrue(packetTcpClient.IsConnected);
                 packetTcpClients.Add(packetTcpClient);
             }

Tests/UnitTestProject/PacketTcpServerTest.cs

@@ -15,7 +15,7 @@ public void StartStopPacketTcpServer_StartWithStartFunctionAndStopWithStopFuncti
             Assert.IsFalse(packetTcpServer.IsStarted);
 
 
-            packetTcpServer.Start(5000);
+            packetTcpServer.Start(0);
             Assert.IsTrue(packetTcpServer.IsStarted, "PacketTcpServer is started by start function");
 
             packetTcpServer.Stop();
@@ -26,7 +26,7 @@ public void StartStopPacketTcpServer_StartWithStartFunctionAndStopWithStopFuncti
         [TestMethod]
         public void StartStopPacketTcpServer_StartWithConstructorAndStopWithStopFunction()
         {
-            var packetTcpServer = new RawTcpServer(5000);
+            var packetTcpServer = new RawTcpServer(0);
             Assert.IsTrue(packetTcpServer.IsStarted, "PacketTcpServer is started by constructor");
 
             packetTcpServer.Stop();

Tests/UnitTestProject/RawTcpServerClientTest.cs

@@ -17,7 +17,7 @@ public void ServerClientTest()
             var rawTcpServer = new RawTcpServer();
             Assert.IsFalse(rawTcpServer.IsStarted);
 
-            rawTcpServer.Start(5001);
+            rawTcpServer.Start(0);
             Assert.IsTrue(rawTcpServer.IsStarted, "RawTcpServer is started by start function");
 
             Assert.IsTrue(rawTcpServer.Clients.Length == 0);
@@ -26,7 +26,7 @@ public void ServerClientTest()
             for(int i = 0; i < 25; i++)
             {
                 var rawTcpClient = new RawTcpClient();
-                rawTcpClient.Connect("localhost", 5001);
+                rawTcpClient.Connect("localhost", rawTcpServer.Port);
                 Assert.IsTrue(rawTcpClient.IsConnected);
                 rawTcpClients.Add(rawTcpClient);
             }
@@ -37,7 +37,7 @@ public void ServerClientTest()
 
             for (int i = 0; i < 25; i++)
             {
-                var rawTcpClient = new RawTcpClient("localhost", 5001);
+                var rawTcpClient = new RawTcpClient("localhost", rawTcpServer.Port);
                 Assert.IsTrue(rawTcpClient.IsConnected);
                 rawTcpClients.Add(rawTcpClient);
             }

Tests/UnitTestProject/RawTcpServerTest.cs

@@ -15,7 +15,7 @@ public void StartStopRawTcpServer_StartWithStartFunctionAndStopWithStopFunction(
             Assert.IsFalse(rawTcpServer.IsStarted);
 
 
-            rawTcpServer.Start(5000);
+            rawTcpServer.Start(0);
             Assert.IsTrue(rawTcpServer.IsStarted, "RawTcpServer is started by start function");
 
             rawTcpServer.Stop();
@@ -26,7 +26,7 @@ public void StartStopRawTcpServer_StartWithStartFunctionAndStopWithStopFunction(
         [TestMethod]
         public void StartStopRawTcpServer_StartWithConstructorAndStopWithStopFunction()
         {
-            var rawTcpServer = new RawTcpServer(5000);
+            var rawTcpServer = new RawTcpServer(0);
             Assert.IsTrue(rawTcpServer.IsStarted, "RawTcpServer is started by constructor");
 
             rawTcpServer.Stop();