requrst 1.0.0__tar.gz → 2.0.0__tar.gz

{requrst-1.0.0 → requrst-2.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: requrst
-Version: 1.0.0
+Version: 2.0.0
 Summary: 纯Python Socket手写HTTP/HTTPS客户端，零第三方依赖，第二方自研请求库
 Home-page: 
 Author: 

requrst-2.0.0/requrst/__init__.py

@@ -0,0 +1,14 @@
+from .core import (
+    get, post, Session, Response, RequestContext,
+    register_before_request, extract_html_text, send_email,
+    DEFAULT_VERIFY, DEFAULT_TIMEOUT, DEFAULT_RETRY,
+    DEFAULT_MAX_REDIRECTS, DEFAULT_HEADERS
+)
+
+__version__ = "2.0.0"
+__all__ = [
+    "get", "post", "Session", "Response", "RequestContext",
+    "register_before_request", "extract_html_text", "send_email",
+    "DEFAULT_VERIFY", "DEFAULT_TIMEOUT", "DEFAULT_RETRY",
+    "DEFAULT_MAX_REDIRECTS", "DEFAULT_HEADERS"
+]

{requrst-1.0.0 → requrst-2.0.0}/requrst/core.py

@@ -14,18 +14,6 @@ DEFAULT_RETRY = 1
 DEFAULT_MAX_REDIRECTS = 3
 DEFAULT_VERIFY = True
 
-def recv_all(sock, buf_size=4096):
-    data = b""
-    while True:
-        try:
-            chunk = sock.recv(buf_size)
-            if not chunk:
-                break
-            data += chunk
-        except (socket.timeout, ConnectionResetError):
-            break
-    return data
-
 def recv_smtp_line(sock):
     resp = b""
     while True:
@@ -136,67 +124,46 @@ def _socket_request(host, path, port, scheme, method, headers, body=b"", timeout
             req_data = "\r\n".join(req_lines).encode("utf-8") + body
             sock.sendall(req_data)
 
-            # 读取响应头
-            resp_data = b""
-            while True:
-                chunk = sock.recv(4096)
-                if not chunk:
-                    break
-                resp_data += chunk
-                if b"\r\n\r\n" in resp_data:
-                    break
-
-            header_end = resp_data.find(b"\r\n\r\n")
-            if header_end == -1:
-                return Response(0, {}, b"Invalid HTTP response")
-
-            header_part = resp_data[:header_end].decode("utf-8", errors="ignore")
-            body_part = resp_data[header_end + 4:]
-
-            first_line = header_part.splitlines()[0]
-            parts = first_line.split()
+            sock_file = sock.makefile("rb")
+            status_line = sock_file.readline().decode("utf-8").strip()
+            parts = status_line.split()
             status_code = int(parts[1]) if len(parts) > 1 else 0
 
-            resp_headers = {}
-            for line in header_part.splitlines()[1:]:
+            headers_dict = {}
+            while True:
+                line = sock_file.readline().decode("utf-8").strip()
+                if not line:
+                    break
                 if ": " in line:
                     k, v = line.split(": ", 1)
-                    resp_headers[k.strip()] = v.strip()
-
-            # 根据 Content-Length 或 chunked 继续读取剩余正文
-            content_length = resp_headers.get("Content-Length")
-            transfer_encoding = resp_headers.get("Transfer-Encoding", "").lower()
+                    headers_dict[k] = v
 
+            transfer_encoding = headers_dict.get("Transfer-Encoding", "").lower()
             if transfer_encoding == "chunked":
-                sock.settimeout(timeout)
+                chunked_data = b""
                 while True:
-                    try:
-                        chunk = sock.recv(4096)
-                        if not chunk:
-                            break
-                        body_part += chunk
-                        if b"0\r\n\r\n" in body_part:
-                            break
-                    except socket.timeout:
+                    line = sock_file.readline().decode("utf-8").strip()
+                    if not line:
                         break
-                body_part = _parse_chunked_body(body_part)
-            elif content_length:
-                content_length = int(content_length)
-                received = len(body_part)
-                while received < content_length:
-                    try:
-                        chunk = sock.recv(min(4096, content_length - received))
-                        if not chunk:
-                            break
-                        body_part += chunk
-                        received += len(chunk)
-                    except socket.timeout:
+                    chunk_size = int(line, 16)
+                    if chunk_size == 0:
+                        sock_file.readline()
                         break
-
+                    chunk = sock_file.read(chunk_size)
+                    chunked_data += chunk
+                    sock_file.readline()
+                body_part = chunked_data
+            else:
+                content_length = headers_dict.get("Content-Length")
+                if content_length:
+                    body_part = sock_file.read(int(content_length))
+                else:
+                    body_part = sock_file.read()
+            sock_file.close()
             sock.close()
 
             if status_code in (301, 302, 303, 307, 308) and max_redirects > 0:
-                location = resp_headers.get("Location", "")
+                location = headers_dict.get("Location", "")
                 if location:
                     parsed = urlparse(location)
                     if not parsed.netloc:
@@ -205,7 +172,7 @@ def _socket_request(host, path, port, scheme, method, headers, body=b"", timeout
                     return _request(location, new_method, headers, body if new_method != "GET" else b"",
                                    timeout, verify, retry, max_redirects - 1)
 
-            return Response(status_code, resp_headers, body_part)
+            return Response(status_code, headers_dict, body_part)
 
         except (socket.timeout, ConnectionError, ssl.SSLError) as e:
             if sock:
@@ -311,6 +278,7 @@ def extract_html_text(html: str) -> str:
     text = re.sub(r"\s+", " ", text).strip()
     return text
 
+
 def send_email(smtp_server, smtp_port, sender_email, sender_pwd, to_email, subject, content):
     try:
         sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)

{requrst-1.0.0 → requrst-2.0.0}/requrst.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: requrst
-Version: 1.0.0
+Version: 2.0.0
 Summary: 纯Python Socket手写HTTP/HTTPS客户端，零第三方依赖，第二方自研请求库
 Home-page: 
 Author: 

{requrst-1.0.0 → requrst-2.0.0}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="requrst",
-    version="1.0.0",
+    version="2.0.0",
     author="",
     author_email="",
     description="纯Python Socket手写HTTP/HTTPS客户端，零第三方依赖，第二方自研请求库",

requrst-1.0.0/requrst/__init__.py

@@ -1,8 +0,0 @@
-from .core import (
-    get, post, Session, Response, RequestContext,
-    register_before_request, extract_html_text, send_email,
-    DEFAULT_VERIFY, DEFAULT_TIMEOUT, DEFAULT_RETRY,
-    DEFAULT_MAX_REDIRECTS, DEFAULT_HEADERS
-)
-
-__version__ = "1.0.0"