fix up request uri

Author: thatstoasty

lightbug_http/io/bytes.mojo

@@ -182,6 +182,9 @@ struct ByteReader[origin: Origin]:
         self._inner = b
         self.read_pos = 0
 
+    fn copy(self) -> Self:
+        return ByteReader(self._inner[self.read_pos :])
+
     fn __contains__(self, b: Byte) -> Bool:
         for i in range(self.read_pos, len(self._inner)):
             if self._inner[i] == b:

lightbug_http/uri.mojo

@@ -117,7 +117,11 @@ struct URI(Writable, Stringable, Representable):
 
         # Parse the path
         var path: String = "/"
+        var request_uri: String = "/"
         if reader.available() and reader.peek() == Constant.SLASH:
+            # Copy the remaining bytes to read the request uri.
+            var request_uri_reader = reader.copy()
+            request_uri = str(request_uri_reader.read_bytes())
             # Read until the query string, or the end if there is none.
             path = str(reader.read_until(Constant.QUESTION))
 
@@ -136,7 +140,7 @@ struct URI(Writable, Stringable, Representable):
             host=host,
             port=port,
             full_uri=uri,
-            request_uri=uri,
+            request_uri=request_uri,
             username="",
             password="",
         )

tests/lightbug_http/http/test_request.mojo

@@ -8,7 +8,7 @@ def test_request_from_bytes():
     var request = HTTPRequest.from_bytes("127.0.0.1", 4096, data.as_bytes())
     testing.assert_equal(request.protocol, "HTTP/1.1")
     testing.assert_equal(request.method, "GET")
-    testing.assert_equal(request.uri.request_uri, "127.0.0.1/redirect")
+    testing.assert_equal(request.uri.request_uri, "/redirect")
     testing.assert_equal(request.headers["Host"], "127.0.0.1:8080")
     testing.assert_equal(request.headers["User-Agent"], "python-requests/2.32.3")
 

tests/lightbug_http/io/test_byte_writer.mojo

@@ -5,26 +5,29 @@ from lightbug_http.io.bytes import Bytes, ByteWriter
 def test_write_byte():
     var w = ByteWriter()
     w.write_byte(0x01)
-    testing.assert_equal(w.consume(), Bytes(0x01))
+    testing.assert_equal(w^.consume(), Bytes(0x01))
+
+    w = ByteWriter()
     w.write_byte(2)
-    testing.assert_equal(w.consume(), Bytes(2))
+    testing.assert_equal(w^.consume(), Bytes(2))
 
 
 def test_consuming_write():
     var w = ByteWriter()
     var my_string: String = "World"
     w.consuming_write("Hello ")
     w.consuming_write(my_string^)
-    testing.assert_equal(w.consume(), Bytes(72, 101, 108, 108, 111, 32, 87, 111, 114, 108, 100))
+    testing.assert_equal(w^.consume(), Bytes(72, 101, 108, 108, 111, 32, 87, 111, 114, 108, 100))
 
+    w = ByteWriter()
     var my_bytes = Bytes(72, 101, 108, 108, 111, 32)
     w.consuming_write(my_bytes^)
     w.consuming_write(Bytes(87, 111, 114, 108, 10))
-    testing.assert_equal(w.consume(), Bytes(72, 101, 108, 108, 111, 32, 87, 111, 114, 108, 100))
+    testing.assert_equal(w^.consume(), Bytes(72, 101, 108, 108, 111, 32, 87, 111, 114, 108, 100))
 
 
 def test_write():
     var w = ByteWriter()
     w.write("Hello", ", ")
     w.write_bytes("World!".as_bytes())
-    testing.assert_equal(w.consume(), Bytes(72, 101, 108, 108, 111, 44, 32, 87, 111, 114, 108, 100, 33))
+    testing.assert_equal(w^.consume(), Bytes(72, 101, 108, 108, 111, 44, 32, 87, 111, 114, 108, 100, 33))

tests/lightbug_http/test_uri.mojo

@@ -19,7 +19,7 @@ def test_uri_parse_http_with_port():
     testing.assert_equal(uri.port.value(), 8080)
     testing.assert_equal(uri.path, "/index.html")
     testing.assert_equal(uri._original_path, "/index.html")
-    # testing.assert_equal(uri.request_uri, "http://example.com:8080/index.html")
+    testing.assert_equal(uri.request_uri, "/index.html")
     testing.assert_equal(uri.is_https(), False)
     testing.assert_equal(uri.is_http(), True)
     testing.assert_equal(uri.query_string, empty_string)
@@ -32,7 +32,7 @@ def test_uri_parse_https_with_port():
     testing.assert_equal(uri.port.value(), 8080)
     testing.assert_equal(uri.path, "/index.html")
     testing.assert_equal(uri._original_path, "/index.html")
-    # testing.assert_equal(uri.request_uri, "https://example.com:8080/index.html")
+    testing.assert_equal(uri.request_uri, "/index.html")
     testing.assert_equal(uri.is_https(), True)
     testing.assert_equal(uri.is_http(), False)
     testing.assert_equal(uri.query_string, empty_string)
@@ -44,7 +44,7 @@ def test_uri_parse_http_with_path():
     testing.assert_equal(uri.host, "example.com")
     testing.assert_equal(uri.path, "/index.html")
     testing.assert_equal(uri._original_path, "/index.html")
-    # testing.assert_equal(uri.request_uri, "http://example.com/index.html")
+    testing.assert_equal(uri.request_uri, "/index.html")
     testing.assert_equal(uri.is_https(), False)
     testing.assert_equal(uri.is_http(), True)
     testing.assert_equal(uri.query_string, empty_string)
@@ -56,7 +56,7 @@ def test_uri_parse_https_with_path():
     testing.assert_equal(uri.host, "example.com")
     testing.assert_equal(uri.path, "/index.html")
     testing.assert_equal(uri._original_path, "/index.html")
-    # testing.assert_equal(uri.request_uri, "https://example.com/index.html")
+    testing.assert_equal(uri.request_uri, "/index.html")
     testing.assert_equal(uri.is_https(), True)
     testing.assert_equal(uri.is_http(), False)
     testing.assert_equal(uri.query_string, empty_string)
@@ -68,7 +68,7 @@ def test_uri_parse_http_basic():
     testing.assert_equal(uri.host, "example.com")
     testing.assert_equal(uri.path, "/")
     testing.assert_equal(uri._original_path, "/")
-    # testing.assert_equal(uri.request_uri, "/")
+    testing.assert_equal(uri.request_uri, "/")
     testing.assert_equal(uri.query_string, empty_string)
 
 
@@ -78,7 +78,7 @@ def test_uri_parse_http_basic_www():
     testing.assert_equal(uri.host, "www.example.com")
     testing.assert_equal(uri.path, "/")
     testing.assert_equal(uri._original_path, "/")
-    # testing.assert_equal(uri.request_uri, "/")
+    testing.assert_equal(uri.request_uri, "/")
     testing.assert_equal(uri.query_string, empty_string)
 
 
@@ -88,7 +88,7 @@ def test_uri_parse_http_with_query_string():
     testing.assert_equal(uri.host, "www.example.com")
     testing.assert_equal(uri.path, "/job")
     testing.assert_equal(uri._original_path, "/job")
-    # testing.assert_equal(uri.request_uri, "/job?title=engineer")
+    testing.assert_equal(uri.request_uri, "/job?title=engineer")
     testing.assert_equal(uri.query_string, "title=engineer")
 
 
@@ -98,5 +98,20 @@ def test_uri_parse_no_scheme():
     testing.assert_equal(uri.host, "www.example.com")
 
 
+def test_uri_ip_address_no_scheme():
+    var uri = URI.parse("168.22.0.1/path/to/favicon.ico")
+    testing.assert_equal(uri.scheme, "http")
+    testing.assert_equal(uri.host, "168.22.0.1")
+    testing.assert_equal(uri.path, "/path/to/favicon.ico")
+
+
+def test_uri_ip_address():
+    var uri = URI.parse("http://168.22.0.1:8080/path/to/favicon.ico")
+    testing.assert_equal(uri.scheme, "http")
+    testing.assert_equal(uri.host, "168.22.0.1")
+    testing.assert_equal(uri.path, "/path/to/favicon.ico")
+    testing.assert_equal(uri.port.value(), 8080)
+
+
 # def test_uri_parse_http_with_hash():
 #     ...