enable serving static files

Author: saviorand

README.md

@@ -127,6 +127,31 @@ Once you have Mojo set up locally,
 
 <p align="right">(<a href="#readme-top">back to top</a>)</p>
 
+### Serving static files
+
+The default welcome screen shows an example of how to serve files like images or HTML using Lightbug. Mojo has built-in `open`, `read` and `read_bytes` methods that you can use to read files from e.g. a `static` directory and serve them on a route:
+
+```mojo
+@value
+struct Welcome(HTTPService):
+    fn func(self, req: HTTPRequest) raises -> HTTPResponse:
+        var uri = req.uri()
+
+        if uri.path() == "/":
+            var html: Bytes
+            with open("static/lightbug_welcome.html", "r") as f:
+                html = f.read_bytes()
+            return OK(html, "text/html; charset=utf-8")
+        
+        if uri.path() == "/logo.png":
+            var image: Bytes
+            with open("static/logo.png", "r") as f:
+                image = f.read_bytes()
+            return OK(image, "image/png")
+        
+        return NotFound(uri.path())
+```
+
 ### Using the client
 
 Create a file, e.g `client.mojo` with the following code:

external/libc.mojo

@@ -1,3 +1,5 @@
+from lightbug_http.io.bytes import Bytes
+
 alias IPPROTO_IPV6 = 41
 alias IPV6_V6ONLY = 26
 alias EPROTONOSUPPORT = 93
@@ -83,6 +85,12 @@ fn to_char_ptr(s: String) -> Pointer[c_char]:
     return ptr
 
 
+fn to_char_ptr(s: Bytes) -> Pointer[c_char]:
+    var ptr = Pointer[c_char]().alloc(len(s))
+    for i in range(len(s)):
+        ptr.store(i, int(s[i]))
+    return ptr
+
 fn c_charptr_to_string(s: Pointer[c_char]) -> String:
     return String(s.bitcast[Int8](), strlen(s))
 

lightbug_http/header.mojo

@@ -369,6 +369,27 @@ struct ResponseHeader:
         self.__server = Bytes()
         self.__trailer = Bytes()
         self.raw_headers = Bytes()
+    
+    fn __init__(
+        inout self,
+        status_code: Int,
+        status_message: Bytes,
+        content_type: Bytes,
+        content_encoding: Bytes,
+    ) -> None:
+        self.disable_normalization = False
+        self.no_http_1_1 = False
+        self.__connection_close = False
+        self.__status_code = status_code
+        self.__status_message = status_message
+        self.__protocol = Bytes()
+        self.__content_length = 0
+        self.__content_length_bytes = Bytes()
+        self.__content_type = content_type
+        self.__content_encoding = content_encoding
+        self.__server = Bytes()
+        self.__trailer = Bytes()
+        self.raw_headers = Bytes()
 
     fn __init__(
         inout self,

lightbug_http/http.mojo

@@ -216,7 +216,6 @@ struct HTTPResponse(Response):
 fn OK(body: Bytes) -> HTTPResponse:
     return HTTPResponse(
         ResponseHeader(
-            True,
             200,
             String("OK").as_bytes(),
             String("Content-Type: text/plain").as_bytes(),
@@ -227,10 +226,21 @@ fn OK(body: Bytes) -> HTTPResponse:
 
 fn OK(body: Bytes, content_type: String) -> HTTPResponse:
     return HTTPResponse(
-        ResponseHeader(True, 200, String("OK").as_bytes(), content_type.as_bytes()),
+        ResponseHeader(200, String("OK").as_bytes(), content_type.as_bytes()),
         body,
     )
 
+fn OK(body: Bytes, content_type: String, content_encoding: String) -> HTTPResponse:
+    return HTTPResponse(
+        ResponseHeader(200, String("OK").as_bytes(), content_type.as_bytes(), content_encoding.as_bytes()),
+        body,
+    )
+
+fn NotFound(path: String) -> HTTPResponse:
+    return HTTPResponse(
+        ResponseHeader(404, String("Not Found").as_bytes(), String("text/plain").as_bytes()),
+        String("path " + path + " not found").as_bytes(),
+    )
 
 fn encode(req: HTTPRequest, uri: URI) raises -> Bytes:
     var res_str = String()
@@ -303,8 +313,10 @@ fn encode(res: HTTPResponse) raises -> Bytes:
     _ = builder.write(res.header.content_type())
     _ = builder.write_string(String("\r\n"))
 
-    # TODO: propagate charset
-    # res_str += String("; charset=utf-8")
+    if len(res.header.content_encoding()) > 0:
+        _ = builder.write_string(String("Content-Encoding: "))
+        _ = builder.write(res.header.content_encoding())
+        _ = builder.write_string(String("\r\n"))
 
     if len(res.body_raw) > 0:
         _ = builder.write_string(String("Content-Length: "))

lightbug_http/service.mojo

@@ -1,5 +1,5 @@
-from lightbug_http.http import HTTPRequest, HTTPResponse, OK
-
+from lightbug_http.http import HTTPRequest, HTTPResponse, OK, NotFound
+from lightbug_http.io.bytes import Bytes
 
 trait HTTPService:
     fn func(self, req: HTTPRequest) raises -> HTTPResponse:
@@ -18,11 +18,23 @@ struct Printer(HTTPService):
 @value
 struct Welcome(HTTPService):
     fn func(self, req: HTTPRequest) raises -> HTTPResponse:
-        var html: String
-        with open("static/lightbug_welcome.html", "r") as f:
-            html = f.read()
+        var uri = req.uri()
 
-        return OK(html.as_bytes(), "text/html")
+        if uri.path() == "/":
+            var html: Bytes
+            with open("static/lightbug_welcome.html", "r") as f:
+                html = f.read_bytes()
+            return OK(html, "text/html; charset=utf-8")
+        
+        if uri.path() == "/logo.png":
+            var image: Bytes
+            with open("static/logo.png", "r") as f:
+                image = f.read_bytes()
+            return OK(image, "image/png")
+        
+        return NotFound(uri.path())
+
+        
 
 
 @value

lightbug_http/sys/client.mojo

@@ -94,6 +94,7 @@ struct MojoClient(Client):
         var conn = create_connection(self.fd, host_str, port)
 
         var req_encoded = encode(req, uri)
+        print(String(req_encoded))
         var bytes_sent = conn.write(req_encoded)
         if bytes_sent == -1:
             raise Error("Failed to send message")

lightbug_http/sys/net.mojo

@@ -227,10 +227,14 @@ struct SysConnection(Connection):
         buf = bytes_str._buffer
         return bytes_recv
 
-    fn write(self, buf: Bytes) raises -> Int:
-        var msg = String(buf)
+    fn write(self, msg: String) raises -> Int:
         if send(self.fd, to_char_ptr(msg).bitcast[c_void](), len(msg), 0) == -1:
             print("Failed to send response")
+        return len(msg)
+    
+    fn write(self, buf: Bytes) raises -> Int:
+        if send(self.fd, to_char_ptr(buf).bitcast[c_void](), len(buf), 0) == -1:
+            print("Failed to send response")
         return len(buf)
 
     fn close(self) raises: