ch09 refactoring

- removed `http` since it's duplicate of `ch06.asyncHttp`
spamegg1 · Apr 13, 2024 · 36fbae9 · 36fbae9
1 parent 7db9181
commit 36fbae9
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 159 deletions.
diff --git a/src/main/scala/ch06/asyncHttp/http.scala b/src/main/scala/ch06/asyncHttp/http.scala
@@ -31,13 +31,8 @@ object HTTP:
 
   def scanRequestLine(line: CString): (String, String, Int) =
     val lineLen = stackalloc[Int](1)
-    val scanResult = stdio.sscanf(
-      line,
-      c"%s %s %*s\r\n%n",
-      methodBuffer,
-      uriBuffer,
-      lineLen
-    )
+    val scanResult =
+      stdio.sscanf(line, c"%s %s %*s\r\n%n", methodBuffer, uriBuffer, lineLen)
     if scanResult == 2 then (fromCString(methodBuffer), fromCString(uriBuffer), !lineLen)
     else throw Exception("bad request line")
 
@@ -62,12 +57,15 @@ object HTTP:
       val startOfKey = line
       val endOfKey = line + !keyEnd
       !endOfKey = 0
+
       val startOfValue = line + !valueStart
       val endOfValue = line + !valueEnd
       !endOfValue = 0
+
       val key = fromCString(startOfKey)
       val value = fromCString(startOfValue)
       outMap(key) = value
+
       !lineLen
     else throw Exception("bad header line")
 

diff --git a/src/main/scala/ch09/lmdbWeb/http.scala b/src/main/scala/ch09/lmdbWeb/http.scala
diff --git a/src/main/scala/ch09/lmdbWeb/main.scala b/src/main/scala/ch09/lmdbWeb/main.scala
@@ -7,6 +7,8 @@ import scalanative.libc.{stdlib, string}, stdlib.malloc
 import argonaut.{Argonaut, EncodeJson, DecodeJson}
 import Argonaut.{StringToParseWrap, ToJsonIdentity}
 
+import ch03.http.{HttpRequest, HttpResponse}
+
 val addPatn = raw"/add/([^/]+)/([^/]+)".r
 val fetchPatn = raw"/fetch/([^/]+)".r
 val listPatn = raw"/list/([^/]+)".r

diff --git a/src/main/scala/ch09/lmdbWeb/server.scala b/src/main/scala/ch09/lmdbWeb/server.scala
@@ -6,7 +6,9 @@ import scalanative.unsafe.*
 import scalanative.libc.{stdlib, string}, stdlib.malloc
 
 object Server:
-  import LibUV.*, ch07.LibUVConstants.*, HTTP.RequestHandler
+  import LibUV.*, ch07.LibUVConstants.*
+  import ch06.asyncHttp.HTTP, HTTP.RequestHandler
+  import ch03.http.{HttpRequest, HttpResponse}
 
   type ClientState = CStruct3[Ptr[Byte], CSize, CSize]