wip

Author: thatstoasty

lightbug_http/client.mojo

@@ -1,16 +1,5 @@
 from collections import Dict
 from memory import UnsafePointer
-from lightbug_http.libc import (
-    c_int,
-    AF_INET,
-    SOCK_STREAM,
-    socket,
-    connect,
-    send,
-    recv,
-    close,
-)
-from lightbug_http.strings import to_string
 from lightbug_http.net import default_buffer_size
 from lightbug_http.http import HTTPRequest, HTTPResponse, encode
 from lightbug_http.header import Headers, HeaderKey

lightbug_http/net.mojo

@@ -114,6 +114,15 @@ struct NoTLSListener:
     fn __moveinit__(out self, owned existing: Self):
         self.socket = existing.socket^
 
+    fn __enter__(owned self) -> Self:
+        return self^
+
+    fn __del__(owned self):
+        try:
+            self.socket.teardown()
+        except e:
+            logger.debug("NoTLSListener.__del__: Failed to close socket on deletion:", e)
+
     fn accept(self) raises -> TCPConnection:
         return TCPConnection(self.socket.accept())
 
@@ -199,6 +208,12 @@ struct TCPConnection:
     fn __moveinit__(out self, owned existing: Self):
         self.socket = existing.socket^
 
+    fn __del__(owned self):
+        try:
+            self.socket.teardown()
+        except e:
+            logger.debug("TCPConnection.__del__: Failed to close socket on deletion:", e)
+
     fn read(self, mut buf: Bytes) raises -> Int:
         try:
             return self.socket.receive(buf)

lightbug_http/socket.mojo

@@ -168,11 +168,9 @@ struct Socket[AddrType: Addr, address_family: Int = AF_INET](Representable, Stri
                 logger.error("Socket.teardown: Failed to close socket.")
                 raise e
 
-    fn __enter__(owned self) -> Self:
-        return self^
-
-    fn __exit__(mut self) raises:
-        self.teardown()
+    # TODO: Removed until we can determine why __del__ bugs out in the client flow, but not server flow?
+    # fn __enter__(owned self) -> Self:
+    #     return self^
 
     # TODO: Seems to be bugged if this is included. Mojo tries to delete a mystical 0 fd socket that was never initialized?
     # fn __del__(owned self):
@@ -181,7 +179,7 @@ struct Socket[AddrType: Addr, address_family: Int = AF_INET](Representable, Stri
     #     try:
     #         self.teardown()
     #     except e:
-    #         logger.debug("Socket.__del__: Failed to close socket during deletion:", str(e))
+    #         logger.debug("Socket.__del__: Failed to close socket during deletion:", e)
 
     fn __str__(self) -> String:
         return String.write(self)