Merge pull request #260 from Lightbug-HQ/chore/update-25-4

saviorand · web-flow · commit 508f4210fd32 · 2025-06-22T15:47:25.000+02:00
Update to 25.4
diff --git a/README.md b/README.md
@@ -60,7 +60,7 @@ Once you have a Mojo project set up locally,
 
    ```toml
    [dependencies]
-   lightbug_http = ">=25.3.0"
+   lightbug_http = ">=25.4.0"
    ```
 
 3. Run `magic install` at the root of your project, where `mojoproject.toml` is located
diff --git a/lightbug_http/_libc.mojo b/lightbug_http/_libc.mojo
@@ -93,7 +93,7 @@ alias in_port_t = c_ushort
 # Address Family Constants
 @value
 @register_passable("trivial")
-struct AddressFamily:
+struct AddressFamily(EqualityComparable & Copyable & Movable):
     var value: Int32
     alias AF_UNSPEC = Self(0)
     """unspecified"""
diff --git a/lightbug_http/_logger.mojo b/lightbug_http/_logger.mojo
@@ -63,50 +63,45 @@ struct Logger[level: Int]:
         var msg = String.write("\033[36mINFO\033[0m  - ")
 
         @parameter
-        fn write_message[T: Writable](message: T):
-            msg.write(message, " ")
+        for i in range(messages.__len__()):
+            msg.write(messages[i], " ")
 
-        messages.each[write_message]()
         self._log_message[LogLevel.INFO](msg)
 
     fn warn[*Ts: Writable](self, *messages: *Ts):
         var msg = String.write("\033[33mWARN\033[0m  - ")
 
         @parameter
-        fn write_message[T: Writable](message: T):
-            msg.write(message, " ")
+        for i in range(messages.__len__()):
+            msg.write(messages[i], " ")
 
-        messages.each[write_message]()
         self._log_message[LogLevel.WARN](msg)
 
     fn error[*Ts: Writable](self, *messages: *Ts):
         var msg = String.write("\033[31mERROR\033[0m - ")
 
         @parameter
-        fn write_message[T: Writable](message: T):
-            msg.write(message, " ")
+        for i in range(messages.__len__()):
+            msg.write(messages[i], " ")
 
-        messages.each[write_message]()
         self._log_message[LogLevel.ERROR](msg)
 
     fn debug[*Ts: Writable](self, *messages: *Ts):
         var msg = String.write("\033[34mDEBUG\033[0m - ")
 
         @parameter
-        fn write_message[T: Writable](message: T):
-            msg.write(message, " ")
+        for i in range(messages.__len__()):
+            msg.write(messages[i], " ")
 
-        messages.each[write_message]()
         self._log_message[LogLevel.DEBUG](msg)
 
     fn fatal[*Ts: Writable](self, *messages: *Ts):
         var msg = String.write("\033[35mFATAL\033[0m - ")
 
         @parameter
-        fn write_message[T: Writable](message: T):
-            msg.write(message, " ")
+        for i in range(messages.__len__()):
+            msg.write(messages[i], " ")
 
-        messages.each[write_message]()
         self._log_message[LogLevel.FATAL](msg)
 
 
diff --git a/lightbug_http/_owning_list.mojo b/lightbug_http/_owning_list.mojo
@@ -122,7 +122,7 @@ struct OwningList[T: Movable](Movable, Sized, Boolable):
 
         Parameters:
             U: The type of the elements in the list. Must implement the
-              traits `EqualityComparable` and `CollectionElement`.
+              traits `EqualityComparable`, `Copyable`, and `Movable`.
 
         Args:
             value: The value to find.
diff --git a/lightbug_http/connection.mojo b/lightbug_http/connection.mojo
@@ -139,7 +139,7 @@ struct ListenConfig:
         return listener^
 
 
-struct TCPConnection:
+struct TCPConnection(Connection):
     var socket: Socket[TCPAddr]
 
     fn __init__(out self, owned socket: Socket[TCPAddr]):
diff --git a/lightbug_http/cookie/cookie.mojo b/lightbug_http/cookie/cookie.mojo
@@ -2,7 +2,7 @@ from collections import Optional
 from lightbug_http.header import HeaderKey
 
 
-struct Cookie(CollectionElement):
+struct Cookie(Copyable, Movable):
     alias EXPIRES = "Expires"
     alias MAX_AGE = "Max-Age"
     alias DOMAIN = "Domain"
@@ -47,15 +47,15 @@ struct Cookie(CollectionElement):
             elif part == Cookie.HTTP_ONLY:
                 cookie.http_only = True
             elif part.startswith(Cookie.SAME_SITE):
-                cookie.same_site = SameSite.from_string(part.removeprefix(Cookie.SAME_SITE + Cookie.EQUAL))
+                cookie.same_site = SameSite.from_string(String(part.removeprefix(Cookie.SAME_SITE + Cookie.EQUAL)))
             elif part.startswith(Cookie.DOMAIN):
-                cookie.domain = part.removeprefix(Cookie.DOMAIN + Cookie.EQUAL)
+                cookie.domain = String(part.removeprefix(Cookie.DOMAIN + Cookie.EQUAL))
             elif part.startswith(Cookie.PATH):
-                cookie.path = part.removeprefix(Cookie.PATH + Cookie.EQUAL)
+                cookie.path = String(part.removeprefix(Cookie.PATH + Cookie.EQUAL))
             elif part.startswith(Cookie.MAX_AGE):
-                cookie.max_age = Duration.from_string(part.removeprefix(Cookie.MAX_AGE + Cookie.EQUAL))
+                cookie.max_age = Duration.from_string(String(part.removeprefix(Cookie.MAX_AGE + Cookie.EQUAL)))
             elif part.startswith(Cookie.EXPIRES):
-                var expires = Expiration.from_string(part.removeprefix(Cookie.EXPIRES + Cookie.EQUAL))
+                var expires = Expiration.from_string(String(part.removeprefix(Cookie.EXPIRES + Cookie.EQUAL)))
                 if expires:
                     cookie.expires = expires.value()
 
diff --git a/lightbug_http/cookie/expiration.mojo b/lightbug_http/cookie/expiration.mojo
@@ -1,11 +1,13 @@
+from collections import Optional
 from lightbug_http.external.small_time import SmallTime
+from lightbug_http.strings import to_string
 
 alias HTTP_DATE_FORMAT = "ddd, DD MMM YYYY HH:mm:ss ZZZ"
 alias TZ_GMT = TimeZone(0, "GMT")
 
 
 @value
-struct Expiration(CollectionElement):
+struct Expiration(Copyable, Movable):
     var variant: UInt8
     var datetime: Optional[SmallTime]
 
diff --git a/lightbug_http/cookie/request_cookie_jar.mojo b/lightbug_http/cookie/request_cookie_jar.mojo
@@ -16,7 +16,7 @@ struct RequestCookieJar(Writable, Stringable):
     fn __init__(out self, *cookies: Cookie):
         self._inner = Dict[String, String]()
         for cookie in cookies:
-            self._inner[cookie[].name] = cookie[].value
+            self._inner[cookie.name] = cookie.value
 
     fn parse_cookies(mut self, headers: Headers) raises:
         var cookie_header = headers.get(HeaderKey.COOKIE)
@@ -27,9 +27,9 @@ struct RequestCookieJar(Writable, Stringable):
 
         for chunk in cookie_strings:
             var key = String("")
-            var value = chunk[]
-            if "=" in chunk[]:
-                var key_value = chunk[].split("=")
+            var value = chunk
+            if "=" in chunk:
+                var key_value = chunk.split("=")
                 key = key_value[0]
                 value = key_value[1]
 
@@ -64,7 +64,7 @@ struct RequestCookieJar(Writable, Stringable):
 
         var header_value = List[String]()
         for cookie in self._inner.items():
-            header_value.append(cookie[].key + equal + cookie[].value)
+            header_value.append(cookie.key + equal + cookie.value)
         return Header(HeaderKey.COOKIE, StaticString("; ").join(header_value))
 
     fn encode_to(mut self, mut writer: ByteWriter):
diff --git a/lightbug_http/cookie/response_cookie_jar.mojo b/lightbug_http/cookie/response_cookie_jar.mojo
@@ -41,7 +41,7 @@ struct ResponseCookieKey(KeyElement):
 
 
 @value
-struct ResponseCookieJar(Writable, Stringable):
+struct ResponseCookieJar(Writable, Stringable, Copyable, Movable, Sized):
     var _inner: Dict[ResponseCookieKey, Cookie]
 
     fn __init__(out self):
@@ -50,7 +50,7 @@ struct ResponseCookieJar(Writable, Stringable):
     fn __init__(out self, *cookies: Cookie):
         self._inner = Dict[ResponseCookieKey, Cookie]()
         for cookie in cookies:
-            self.set_cookie(cookie[])
+            self.set_cookie(cookie)
 
     @always_inline
     fn __setitem__(mut self, key: ResponseCookieKey, value: Cookie):
@@ -90,9 +90,9 @@ struct ResponseCookieJar(Writable, Stringable):
     fn from_headers(mut self, headers: List[String]) raises:
         for header in headers:
             try:
-                self.set_cookie(Cookie.from_set_header(header[]))
+                self.set_cookie(Cookie.from_set_header(header))
             except:
-                raise Error("Failed to parse cookie header string " + header[])
+                raise Error("Failed to parse cookie header string " + header)
 
     # fn encode_to(mut self, mut writer: ByteWriter):
     #     for cookie in self._inner.values():
@@ -101,5 +101,5 @@ struct ResponseCookieJar(Writable, Stringable):
 
     fn write_to[T: Writer](self, mut writer: T):
         for cookie in self._inner.values():
-            var v = cookie[].build_header_value()
+            var v = cookie.build_header_value()
             write_header(writer, HeaderKey.SET_COOKIE, v)
diff --git a/lightbug_http/cookie/same_site.mojo b/lightbug_http/cookie/same_site.mojo
@@ -1,5 +1,5 @@
 @value
-struct SameSite:
+struct SameSite(Stringable):
     var value: UInt8
 
     alias none = SameSite(0)
diff --git a/lightbug_http/header.mojo b/lightbug_http/header.mojo
@@ -52,7 +52,7 @@ struct Headers(Writable, Stringable):
     fn __init__(out self, owned *headers: Header):
         self._inner = Dict[String, String]()
         for header in headers:
-            self[header[].key.lower()] = header[].value
+            self[header.key.lower()] = header.value
 
     @always_inline
     fn empty(self) -> Bool:
@@ -112,7 +112,7 @@ struct Headers(Writable, Stringable):
 
     fn write_to[T: Writer, //](self, mut writer: T):
         for header in self._inner.items():
-            write_header(writer, header[].key, header[].value)
+            write_header(writer, header.key, header.value)
 
     fn __str__(self) -> String:
         return String.write(self)
diff --git a/lightbug_http/http/request.mojo b/lightbug_http/http/request.mojo
@@ -31,7 +31,7 @@ struct RequestMethod:
 
 
 @value
-struct HTTPRequest(Writable, Stringable):
+struct HTTPRequest(Writable, Stringable, Encodable):
     var headers: Headers
     var cookies: RequestCookieJar
     var uri: URI
diff --git a/lightbug_http/http/response.mojo b/lightbug_http/http/response.mojo
@@ -26,7 +26,7 @@ struct StatusCode:
 
 
 @value
-struct HTTPResponse(Writable, Stringable):
+struct HTTPResponse(Writable, Stringable, Encodable, Sized):
     var headers: Headers
     var cookies: ResponseCookieJar
     var body_raw: Bytes
@@ -179,6 +179,9 @@ struct HTTPResponse(Writable, Stringable):
             except:
                 pass
 
+    fn __len__(self) -> Int:
+        return len(self.body_raw)
+
     fn get_body(self) -> StringSlice[__origin_of(self.body_raw)]:
         return StringSlice(unsafe_from_utf8=Span(self.body_raw))
 
diff --git a/lightbug_http/io/bytes.mojo b/lightbug_http/io/bytes.mojo
@@ -52,10 +52,8 @@ struct ByteWriter(Writer):
         """
 
         @parameter
-        fn write_arg[T: Writable](arg: T):
-            arg.write_to(self)
-
-        args.each[write_arg]()
+        for i in range(args.__len__()):
+            args[i].write_to(self)
 
     @always_inline
     fn consuming_write(mut self, owned b: Bytes):
@@ -76,7 +74,7 @@ alias OutOfBoundsError = "Tried to read past the end of the ByteReader."
 
 
 @value
-struct ByteView[origin: Origin]:
+struct ByteView[origin: Origin](Sized, Stringable):
     """Convenience wrapper around a Span of Bytes."""
 
     var _inner: Span[Byte, origin]
@@ -201,7 +199,7 @@ struct ByteView[origin: Origin]:
         return Bytes(self._inner)
 
 
-struct ByteReader[origin: Origin]:
+struct ByteReader[origin: Origin](Sized):
     var _inner: Span[Byte, origin]
     var read_pos: Int
 
diff --git a/lightbug_http/pool_manager.mojo b/lightbug_http/pool_manager.mojo
@@ -6,7 +6,7 @@ from lightbug_http.uri import Scheme
 
 
 @value
-struct PoolKey(Hashable, KeyElement, Writable):
+struct PoolKey(Hashable, KeyElement, Writable, Stringable):
     var host: String
     var port: UInt16
     var scheme: Scheme
@@ -87,8 +87,8 @@ struct PoolManager[ConnectionType: Connection]():
         var connection = self._connections.pop(index)
         #  Shift everything over by one
         for kv in self.mapping.items():
-            if kv[].value > index:
-                self.mapping[kv[].key] -= 1
+            if kv.value > index:
+                self.mapping[kv.key] -= 1
 
         logger.debug("Checked out connection for peer:", String(key) + ", from index:", self._connections.size + 1)
         return connection^
diff --git a/lightbug_http/uri.mojo b/lightbug_http/uri.mojo
@@ -55,7 +55,7 @@ fn unquote[expand_plus: Bool = False](input_str: String, disallowed_escapes: Lis
             var sub_str_from_bytes = String()
             sub_str_from_bytes.write_bytes(str_bytes)
             for disallowed in disallowed_escapes:
-                sub_str_from_bytes = sub_str_from_bytes.replace(disallowed[], "")
+                sub_str_from_bytes = sub_str_from_bytes.replace(disallowed, "")
             sub_strings.append(sub_str_from_bytes)
             str_bytes.clear()
 
@@ -171,7 +171,7 @@ struct URI(Writable, Stringable, Representable):
             var port_end = colon + 1
             # loop through the post colon chunk until we find a non-digit character
             for b in host_and_port[colon + 1 :]:
-                if b[] < PortBounds.ZERO or b[] > PortBounds.NINE:
+                if b < PortBounds.ZERO or b > PortBounds.NINE:
                     break
                 port_end += 1
             port = UInt16(atol(String(host_and_port[colon + 1 : port_end])))
@@ -208,7 +208,7 @@ struct URI(Writable, Stringable, Representable):
             var query_items = query.split(QueryDelimiters.ITEM)
 
             for item in query_items:
-                var key_val = item[].split(QueryDelimiters.ITEM_ASSIGN, 1)
+                var key_val = item.split(QueryDelimiters.ITEM_ASSIGN, 1)
                 var key = unquote[expand_plus=True](key_val[0])
 
                 if key:
diff --git a/magic.lock b/magic.lock
diff --git a/mojoproject.toml b/mojoproject.toml
diff --git a/recipes/recipe.yaml b/recipes/recipe.yaml
diff --git a/tests/integration/integration_test_client.mojo b/tests/integration/integration_test_client.mojo
diff --git a/tests/lightbug_http/io/test_bytes.mojo b/tests/lightbug_http/io/test_bytes.mojo
diff --git a/tests/lightbug_http/test_owning_list.mojo b/tests/lightbug_http/test_owning_list.mojo
