fix the client

Author: saviorand

client.mojo

@@ -5,6 +5,12 @@ from lightbug_http.sys.client import MojoClient
 
 fn test_request(inout client: MojoClient) raises -> None:
     var uri = URI("http://httpbin.org/status/404")
+    try:
+        uri.parse()
+    except e:
+        print("error parsing uri: " + e.__str__())
+
+
     var request = HTTPRequest(uri)
     var response = client.do(request)
 
@@ -17,9 +23,10 @@ fn test_request(inout client: MojoClient) raises -> None:
     # print parsed headers (only some are parsed for now)
     print("Content-Type:", String(response.header.content_type()))
     print("Content-Length", response.header.content_length())
-    print("Connection:", response.header.connection_close())
     print("Server:", String(response.header.server()))
 
+    print("Is connection set to connection-close? ", response.header.connection_close())
+
     # print body
     print(String(response.get_body_bytes()))
 

lightbug_http/header.mojo

@@ -678,21 +678,16 @@ struct ResponseHeader:
             raise Error("Could not find HTTP version in response line: " + String(b))
 
         _ = self.set_protocol(b[:first_whitespace])
+        
+        var end_of_status_code = first_whitespace+5 # status code is always 3 digits, this calculation includes null terminator
 
-        var last_whitespace = last_index_byte(b, bytes(whitespace, pop=False)[0]) + 1
-
-        if last_whitespace < 0:
-            raise Error("Could not find status code or in response line: " + String(b))
-        elif last_whitespace == 0:
-            raise Error("Response URI is empty: " + String(b))
+        var status_code = atol(b[first_whitespace+1:end_of_status_code])
+        _ = self.set_status_code(status_code)
 
-        var status_text = b[last_whitespace :]
+        var status_text = b[end_of_status_code + 1 :]
         if len(status_text) > 1:
             _ = self.set_status_message(status_text)   
 
-        var status_code = atol(b[first_whitespace+1:last_whitespace])
-        _ = self.set_status_code(status_code)
-
         return len(buf) - len(b_next)
 
     fn parse_headers(inout self, buf: Bytes) raises -> None:

lightbug_http/http.mojo

@@ -282,8 +282,8 @@ fn encode(req: HTTPRequest) raises -> StringSlice[False, ImmutableStaticLifetime
 
     _ = builder.write(req.header.method())
     _ = builder.write_string(whitespace)
-    if len(req.header.request_uri()) > 1:
-        _ = builder.write(req.header.request_uri())
+    if len(req.uri().path_bytes()) > 1:
+        _ = builder.write_string(req.uri().path())
     else:
         _ = builder.write_string(strSlash)
     _ = builder.write_string(whitespace)
@@ -324,7 +324,7 @@ fn encode(req: HTTPRequest) raises -> StringSlice[False, ImmutableStaticLifetime
 
     if len(req.body_raw) > 0:
         _ = builder.write(req.get_body_bytes())
-
+    
     return StringSlice[False, ImmutableStaticLifetime](unsafe_from_utf8_ptr=builder.render().unsafe_ptr(), len=builder.size)
 
 

lightbug_http/io/bytes.mojo

@@ -37,8 +37,8 @@ fn last_index_byte(buf: Bytes, c: Byte) -> Int:
 fn compare_case_insensitive(a: Bytes, b: Bytes) -> Bool:
     if len(a) != len(b):
         return False
-    for i in range(len(a)):
-        if a[i].__xor__(0x20) != b[i].__xor__(0x20):
+    for i in range(len(a) - 1):
+        if (a[i] | 0x20) != (b[i] | 0x20):
             return False
     return True
 

lightbug_http/sys/client.mojo

@@ -65,11 +65,6 @@ struct MojoClient(Client):
             If there is a failure in sending or receiving the message.
         """
         var uri = req.uri()
-        try:
-            _ = uri.parse()
-        except e:
-            print("error parsing uri: " + e.__str__())
-
         var host = String(uri.host())
 
         if host == "":
@@ -94,7 +89,7 @@ struct MojoClient(Client):
                 port = 80
 
         var conn = create_connection(self.fd, host_str, port)
-
+        
         var req_encoded = encode(req)
 
         var bytes_sent = conn.write(req_encoded)
@@ -103,6 +98,7 @@ struct MojoClient(Client):
 
         var new_buf = Bytes(capacity=default_buffer_size)
         var bytes_recv = conn.read(new_buf)
+        
         if bytes_recv == 0:
             conn.close()
 

lightbug_http/uri.mojo

@@ -117,7 +117,7 @@ struct URI:
         self.__path = normalise_path(bytes(path), self.__path_original)
         return self
 
-    fn set_path_sbytes(inout self, path: Bytes) -> Self:
+    fn set_path_bytes(inout self, path: Bytes) -> Self:
         self.__path = normalise_path(path, self.__path_original)
         return self
 
@@ -287,8 +287,7 @@ struct URI:
             self.__path_original = bytes(request_uri, pop=False)
             self.__query_string = Bytes()
 
-        _ = self.set_path_sbytes(normalise_path(self.__path_original, self.__path_original))
-
+        _ = self.set_path_bytes(normalise_path(self.__path_original, self.__path_original))
         _ = self.set_request_uri_bytes(bytes(request_uri, pop=False))