add support for chunked transfer encoding

Author: samicpp

src/main/kotlin/dev/samicpp/http/Generics.kt

@@ -21,6 +21,9 @@ interface HttpClient{
     val path: String;
     val host: String;
     val body: ByteArray;
+    
+    val isReady: Boolean;  //  indicates whether headers can be used
+    val isComplete: Boolean;
 }
 
 interface HttpSocket{

src/main/kotlin/dev/samicpp/http/Testing.kt

@@ -15,6 +15,8 @@ class FakeHttpClient: HttpClient{
     override val path: String = "/"
     override val host: String = "about:blank"
     override val body: ByteArray = ByteArray(0)
+    override val isReady: Boolean = true
+    override val isComplete: Boolean = true
 }
 
 class FakeHttpSocket: HttpSocket{

src/main/kotlin/dev/samicpp/http/http1/Http1Socket.kt

@@ -226,14 +226,16 @@ class Http1Socket(private val conn:Socket):HttpSocket{
 
     override fun readClient():HttpClient{
         if(!read_head){
-            val head=read_until("\r\n\r\n".encodeToByteArray()).decodeToString().replace("\r\n","\n").split("\n")
+            val head=read_until("\r\n\r\n".encodeToByteArray()).decodeToString()/*.replace("\r\n","\n")*/.split("\r\n")
             val (method,path,version)=head[0].split(" ")
             _client._method=method
             _client._path=path
             _client._version=version
 
             for(i in 1 until head.size){
-                val (headerb,value)=head[i].split(":",limit=2)
+                val col=head[i].split(":",limit=2)
+                if(col.size<2)continue
+                val (headerb,value)=col
                 val header=headerb.lowercase()
                 if(header in _client._headers){
                     _client._headers[header]!!.add(value.trim())
@@ -242,11 +244,28 @@ class Http1Socket(private val conn:Socket):HttpSocket{
                 }
             }
             read_head=true
+            _client._ready=true
         }; if(!read_body) {
-            // TODO: support chunked transfer encoding
-            val cl=_client._headers["content-length"]?.get(0)?.toInt()?:0
-            _client._body=read_certain(cl)
-            read_body=true
+            if(_client._headers["content-length"]?.get(0)!=null){
+
+                val cl=_client._headers["content-length"]!!.get(0).toInt()
+                _client._body.writeBytes(read_certain(cl))
+                read_body=true
+                _client._bodyComplete=true
+
+            } else if(_client._headers["transfer-encoding"]?.get(0)=="chunked"){
+
+                val chunk=read_until("\r\n".encodeToByteArray()).decodeToString().trim().toInt(16)
+                if(chunk==0){
+                    _client._bodyComplete=true
+                    read_body=true
+                }
+                else _client._body.write(read_certain(chunk+2),0,chunk)
+                
+            } else {
+                _client._bodyComplete=true
+                read_body=true
+            }
         }
 
         // val buff=read_all()
@@ -336,14 +355,18 @@ class Http1Client(override val address:SocketAddress):HttpClient{
     internal var _method=""
     internal var _version=""
     internal var _path=""
-    internal var _body=ByteArray(0)
+    internal var _body=ByteArrayOutputStream()
+    internal var _ready=false
+    internal var _bodyComplete=false
 
     override val headers: Map<String,List<String>> get()=_headers
     override val method: String get()=_method
     override val version: String get()=_version
     override val path: String get()=_path
     override val host: String get()=_headers["host"]?.get(0)?:"about:blank"
-    override val body: ByteArray get()=_body
+    override val body: ByteArray get()=_body.toByteArray()
+    override val isReady get()=_ready
+    override val isComplete get()=_bodyComplete
 }
 
 // fun ByteArray.indexOfSequence(sequence:ByteArray):Int{

src/main/kotlin/dev/samicpp/http/http2/Http2Streams.kt

@@ -4,12 +4,18 @@ import dev.samicpp.http.Http2Client
 import java.net.SocketAddress
 
 
-data class Http2Client(val head:List<Pair<String,String>>,override val body:ByteArray,override val address:SocketAddress):HttpClient{
+data class Http2Client(
+    val head:List<Pair<String,String>>,
+    override val body:ByteArray,
+    override val address:SocketAddress,
+    override val isComplete: Boolean,
+    ):HttpClient{
     override val headers: Map<String,List<String>>
     override val method: String
     override val version: String="HTTP/2"
     override val path: String
     override val host: String
+    override val isReady: Boolean
     init{
         val headers=mutableMapOf<String,MutableList<String>>()
         var method="GET"
@@ -32,13 +38,14 @@ data class Http2Client(val head:List<Pair<String,String>>,override val body:Byte
         this.host=host
         this.method=method
         this.headers=headers
+        this.isReady=head.size>0
     }
 }
 
 // TODO: make sure headers dont exceed SETTINGS_MAX_HEADER_LIST_SIZE
 
 class Http2Stream(val streamID:Int,val conn:Http2Connection):HttpSocket{
-    override var client: HttpClient=Http2Client(listOf(),ByteArray(0),conn.remoteAddress)
+    override var client: HttpClient=Http2Client(listOf(),ByteArray(0),conn.remoteAddress,false)
 
     private var sentHead=false
     private var closed=false
@@ -135,7 +142,12 @@ class Http2Stream(val streamID:Int,val conn:Http2Connection):HttpSocket{
     override fun write(text:String)=write(text.encodeToByteArray())
 
     override fun readClient():HttpClient{
-        val nclient=Http2Client(conn.streamData[streamID]!!.headers,conn.streamData[streamID]!!.body.toByteArray(),conn.remoteAddress)
+        val nclient=Http2Client(
+            conn.streamData[streamID]!!.headers,
+            conn.streamData[streamID]!!.body.toByteArray(),
+            conn.remoteAddress,
+            conn.streamData[streamID]!!.end,
+        )
         client=nclient
         return client
     }