fix scheme parsing bug and remove constants

Author: thatstoasty

lightbug_http/client.mojo

@@ -55,25 +55,23 @@ struct Client:
         """
         if request.uri.host == "":
             raise Error("Client.do: Host must not be empty.")
-        if not request.uri.port:
-            raise Error("Client.do: You must specify the port to connect on.")
 
         var is_tls = False
         var scheme = Scheme.HTTP
         if request.uri.is_https():
             is_tls = True
             scheme = Scheme.HTTPS
 
-        var uri = URI.parse(request.uri.host)
-        var pool_key = PoolKey(uri.host, uri.port.value(), scheme)
+        port = request.uri.port.value() if request.uri.port else 80
+        var pool_key = PoolKey(request.uri.host, port, scheme)
         var cached_connection = False
         var conn: TCPConnection
         try:
             conn = self._connections.take(pool_key)
             cached_connection = True
         except e:
             if str(e) == "PoolManager.take: Key not found.":
-                conn = create_connection(uri.host, uri.port.value())
+                conn = create_connection(request.uri.host, port)
             else:
                 logger.error(e)
                 raise Error("Client.do: Failed to create a connection to host.")

lightbug_http/io/bytes.mojo

@@ -1,17 +1,12 @@
 from utils import StringSlice
 from memory.span import Span, _SpanIter
+from lightbug_http.strings import BytesConstant
 from lightbug_http.net import default_buffer_size
 
 
 alias Bytes = List[Byte, True]
 
 
-struct Constant:
-    alias WHITESPACE: UInt8 = ord(" ")
-    alias CR: UInt8 = ord("\r")
-    alias LF: UInt8 = ord("\n")
-
-
 @always_inline
 fn byte(s: String) -> Byte:
     return ord(s)
@@ -24,12 +19,12 @@ fn bytes(s: String) -> Bytes:
 
 @always_inline
 fn is_newline(b: Byte) -> Bool:
-    return b == Constant.LF or b == Constant.CR
+    return b == BytesConstant.nChar or b == BytesConstant.rChar
 
 
 @always_inline
 fn is_space(b: Byte) -> Bool:
-    return b == Constant.WHITESPACE
+    return b == BytesConstant.whitespace
 
 
 struct ByteWriter(Writer):
@@ -223,7 +218,7 @@ struct ByteReader[origin: Origin]:
 
     @always_inline
     fn read_word(mut self) -> ByteView[origin]:
-        return self.read_until(Constant.WHITESPACE)
+        return self.read_until(BytesConstant.whitespace)
 
     fn read_line(mut self) -> ByteView[origin]:
         var start = self.read_pos
@@ -237,7 +232,7 @@ struct ByteReader[origin: Origin]:
         if not self.available():
             return ret
 
-        if self._inner[self.read_pos] == Constant.CR:
+        if self._inner[self.read_pos] == BytesConstant.rChar:
             self.increment(2)
         else:
             self.increment()
@@ -254,7 +249,7 @@ struct ByteReader[origin: Origin]:
     @always_inline
     fn skip_carriage_return(mut self):
         for i in range(self.read_pos, len(self._inner)):
-            if self._inner[i] == Constant.CR:
+            if self._inner[i] == BytesConstant.rChar:
                 self.increment(2)
             else:
                 break

lightbug_http/uri.mojo

@@ -152,7 +152,7 @@ struct URI(Writable, Stringable, Representable):
         # Parse the scheme, if exists.
         # Assume http if no scheme is provided, fairly safe given the context of lightbug.
         var scheme: String = "http"
-        if ord(URIDelimiters.SCHEME) in reader:
+        if "://" in uri:
             scheme = str(reader.read_until(ord(URIDelimiters.SCHEME)))
             if reader.read_bytes(3) != "://".as_bytes():
                 raise Error("URI.parse: Invalid URI format, scheme should be followed by `://`. Received: " + uri)