chore: new tls-client version

Author: thewebscraping

.gitignore

@@ -160,4 +160,4 @@ cython_debug/
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 .idea/
-tls_requests/bin/*xgo*
+tls_requests/bin/*

tls_requests/models/libraries.py

@@ -1,19 +1,20 @@
 import ctypes
 import glob
+import json
 import os
 import platform
 import re
 import sys
+import urllib.error
+import urllib.request
 from dataclasses import dataclass, field, fields
 from pathlib import Path
 from platform import machine
-from typing import List, Optional
-
-import requests
-from tqdm import tqdm
+from typing import List, Optional, Tuple
 
 __all__ = ["TLSLibrary"]
 
+LATEST_VERSION_TAG_NAME = "v1.11.2"
 BIN_DIR = os.path.join(Path(__file__).resolve(strict=True).parent.parent / "bin")
 GITHUB_API_URL = "https://api.github.com/repos/bogdanfinn/tls-client/releases"
 PLATFORM = sys.platform
@@ -73,7 +74,7 @@ def model_fields_set(cls) -> set:
     @classmethod
     def from_kwargs(cls, **kwargs):
         model_fields_set = cls.model_fields_set()
-        return cls(**{k: v for k, v in kwargs.items() if k in model_fields_set})
+        return cls(**{k: v for k, v in kwargs.items() if k in model_fields_set})  # noqa
 
 
 @dataclass
@@ -133,92 +134,64 @@ class TLSLibrary:
 
     _PATH: str = None
     _STATIC_API_DATA = {
-        "name": "v1.7.10",
-        "tag_name": "v1.7.10",
+        "name": "v1.11.2",
+        "tag_name": "v1.11.2",
         "assets": [
-            {
-                "browser_download_url": "https://github.com/bogdanfinn/tls-client/releases/download/v1.7.10/tls-client-darwin-amd64-1.7.10.dylib",
-                "name": "tls-client-darwin-amd64-1.7.10.dylib",
-            },
-            {
-                "browser_download_url": "https://github.com/bogdanfinn/tls-client/releases/download/v1.7.10/tls-client-darwin-arm64-1.7.10.dylib",
-                "name": "tls-client-darwin-arm64-1.7.10.dylib",
-            },
-            {
-                "browser_download_url": "https://github.com/bogdanfinn/tls-client/releases/download/v1.7.10/tls-client-linux-arm64-1.7.10.so",
-                "name": "tls-client-linux-arm64-1.7.10.so",
-            },
-            {
-                "browser_download_url": "https://github.com/bogdanfinn/tls-client/releases/download/v1.7.10/tls-client-linux-armv7-1.7.10.so",
-                "name": "tls-client-linux-armv7-1.7.10.so",
-            },
-            {
-                "browser_download_url": "https://github.com/bogdanfinn/tls-client/releases/download/v1.7.10/tls-client-linux-ubuntu-amd64-1.7.10.so",
-                "name": "tls-client-linux-ubuntu-amd64-1.7.10.so",
-            },
-            {
-                "browser_download_url": "https://github.com/bogdanfinn/tls-client/releases/download/v1.7.10/tls-client-windows-32-1.7.10.dll",
-                "name": "tls-client-windows-32-1.7.10.dll",
-            },
-            {
-                "browser_download_url": "https://github.com/bogdanfinn/tls-client/releases/download/v1.7.10/tls-client-windows-64-1.7.10.dll",
-                "name": "tls-client-windows-64-1.7.10.dll",
-            },
-            {
-                "browser_download_url": "https://github.com/bogdanfinn/tls-client/releases/download/v1.7.10/tls-client-xgo-1.7.10-darwin-amd64.dylib",
-                "name": "tls-client-xgo-1.7.10-darwin-amd64.dylib",
-            },
-            {
-                "browser_download_url": "https://github.com/bogdanfinn/tls-client/releases/download/v1.7.10/tls-client-xgo-1.7.10-darwin-arm64.dylib",
-                "name": "tls-client-xgo-1.7.10-darwin-arm64.dylib",
-            },
-            {
-                "browser_download_url": "https://github.com/bogdanfinn/tls-client/releases/download/v1.7.10/tls-client-xgo-1.7.10-linux-386.so",
-                "name": "tls-client-xgo-1.7.10-linux-386.so",
-            },
-            {
-                "browser_download_url": "https://github.com/bogdanfinn/tls-client/releases/download/v1.7.10/tls-client-xgo-1.7.10-linux-amd64.so",
-                "name": "tls-client-xgo-1.7.10-linux-amd64.so",
-            },
-            {
-                "browser_download_url": "https://github.com/bogdanfinn/tls-client/releases/download/v1.7.10/tls-client-xgo-1.7.10-linux-arm-5.so",
-                "name": "tls-client-xgo-1.7.10-linux-arm-5.so",
-            },
-            {
-                "browser_download_url": "https://github.com/bogdanfinn/tls-client/releases/download/v1.7.10/tls-client-xgo-1.7.10-linux-arm-6.so",
-                "name": "tls-client-xgo-1.7.10-linux-arm-6.so",
-            },
-            {
-                "browser_download_url": "https://github.com/bogdanfinn/tls-client/releases/download/v1.7.10/tls-client-xgo-1.7.10-linux-arm-7.so",
-                "name": "tls-client-xgo-1.7.10-linux-arm-7.so",
-            },
-            {
-                "browser_download_url": "https://github.com/bogdanfinn/tls-client/releases/download/v1.7.10/tls-client-xgo-1.7.10-linux-arm64.so",
-                "name": "tls-client-xgo-1.7.10-linux-arm64.so",
-            },
-            {
-                "browser_download_url": "https://github.com/bogdanfinn/tls-client/releases/download/v1.7.10/tls-client-xgo-1.7.10-linux-ppc64le.so",
-                "name": "tls-client-xgo-1.7.10-linux-ppc64le.so",
-            },
-            {
-                "browser_download_url": "https://github.com/bogdanfinn/tls-client/releases/download/v1.7.10/tls-client-xgo-1.7.10-linux-riscv64.so",
-                "name": "tls-client-xgo-1.7.10-linux-riscv64.so",
-            },
-            {
-                "browser_download_url": "https://github.com/bogdanfinn/tls-client/releases/download/v1.7.10/tls-client-xgo-1.7.10-linux-s390x.so",
-                "name": "tls-client-xgo-1.7.10-linux-s390x.so",
-            },
-            {
-                "browser_download_url": "https://github.com/bogdanfinn/tls-client/releases/download/v1.7.10/tls-client-xgo-1.7.10-windows-386.dll",
-                "name": "tls-client-xgo-1.7.10-windows-386.dll",
-            },
-            {
-                "browser_download_url": "https://github.com/bogdanfinn/tls-client/releases/download/v1.7.10/tls-client-xgo-1.7.10-windows-amd64.dll",
-                "name": "tls-client-xgo-1.7.10-windows-amd64.dll",
-            },
-        ],
+            {'browser_download_url': 'https://github.com/bogdanfinn/tls-client/releases/download/v1.11.2/tls-client-darwin-amd64-1.11.2.dylib', 'name': 'tls-client-darwin-amd64-1.11.2.dylib'},
+            {'browser_download_url': 'https://github.com/bogdanfinn/tls-client/releases/download/v1.11.2/tls-client-darwin-arm64-1.11.2.dylib', 'name': 'tls-client-darwin-arm64-1.11.2.dylib'},
+            {'browser_download_url': 'https://github.com/bogdanfinn/tls-client/releases/download/v1.11.2/tls-client-linux-alpine-amd64-1.11.2.so', 'name': 'tls-client-linux-alpine-amd64-1.11.2.so'},
+            {'browser_download_url': 'https://github.com/bogdanfinn/tls-client/releases/download/v1.11.2/tls-client-linux-arm64-1.11.2.so', 'name': 'tls-client-linux-arm64-1.11.2.so'},
+            {'browser_download_url': 'https://github.com/bogdanfinn/tls-client/releases/download/v1.11.2/tls-client-linux-armv7-1.11.2.so', 'name': 'tls-client-linux-armv7-1.11.2.so'},
+            {'browser_download_url': 'https://github.com/bogdanfinn/tls-client/releases/download/v1.11.2/tls-client-linux-ubuntu-amd64-1.11.2.so', 'name': 'tls-client-linux-ubuntu-amd64-1.11.2.so'},
+            {'browser_download_url': 'https://github.com/bogdanfinn/tls-client/releases/download/v1.11.2/tls-client-windows-32-1.11.2.dll', 'name': 'tls-client-windows-32-1.11.2.dll'},
+            {'browser_download_url': 'https://github.com/bogdanfinn/tls-client/releases/download/v1.11.2/tls-client-windows-64-1.11.2.dll', 'name': 'tls-client-windows-64-1.11.2.dll'},
+            {'browser_download_url': 'https://github.com/bogdanfinn/tls-client/releases/download/v1.11.2/tls-client-xgo-1.11.2-darwin-amd64.dylib', 'name': 'tls-client-xgo-1.11.2-darwin-amd64.dylib'},
+            {'browser_download_url': 'https://github.com/bogdanfinn/tls-client/releases/download/v1.11.2/tls-client-xgo-1.11.2-darwin-arm64.dylib', 'name': 'tls-client-xgo-1.11.2-darwin-arm64.dylib'},
+            {'browser_download_url': 'https://github.com/bogdanfinn/tls-client/releases/download/v1.11.2/tls-client-xgo-1.11.2-linux-386.so', 'name': 'tls-client-xgo-1.11.2-linux-386.so'},
+            {'browser_download_url': 'https://github.com/bogdanfinn/tls-client/releases/download/v1.11.2/tls-client-xgo-1.11.2-linux-amd64.so', 'name': 'tls-client-xgo-1.11.2-linux-amd64.so'},
+            {'browser_download_url': 'https://github.com/bogdanfinn/tls-client/releases/download/v1.11.2/tls-client-xgo-1.11.2-linux-arm-5.so', 'name': 'tls-client-xgo-1.11.2-linux-arm-5.so'},
+            {'browser_download_url': 'https://github.com/bogdanfinn/tls-client/releases/download/v1.11.2/tls-client-xgo-1.11.2-linux-arm-6.so', 'name': 'tls-client-xgo-1.11.2-linux-arm-6.so'},
+            {'browser_download_url': 'https://github.com/bogdanfinn/tls-client/releases/download/v1.11.2/tls-client-xgo-1.11.2-linux-arm-7.so', 'name': 'tls-client-xgo-1.11.2-linux-arm-7.so'},
+            {'browser_download_url': 'https://github.com/bogdanfinn/tls-client/releases/download/v1.11.2/tls-client-xgo-1.11.2-linux-arm64.so', 'name': 'tls-client-xgo-1.11.2-linux-arm64.so'},
+            {'browser_download_url': 'https://github.com/bogdanfinn/tls-client/releases/download/v1.11.2/tls-client-xgo-1.11.2-linux-ppc64le.so', 'name': 'tls-client-xgo-1.11.2-linux-ppc64le.so'},
+            {'browser_download_url': 'https://github.com/bogdanfinn/tls-client/releases/download/v1.11.2/tls-client-xgo-1.11.2-linux-riscv64.so', 'name': 'tls-client-xgo-1.11.2-linux-riscv64.so'},
+            {'browser_download_url': 'https://github.com/bogdanfinn/tls-client/releases/download/v1.11.2/tls-client-xgo-1.11.2-linux-s390x.so', 'name': 'tls-client-xgo-1.11.2-linux-s390x.so'},
+            {'browser_download_url': 'https://github.com/bogdanfinn/tls-client/releases/download/v1.11.2/tls-client-xgo-1.11.2-windows-386.dll', 'name': 'tls-client-xgo-1.11.2-windows-386.dll'},
+            {'browser_download_url': 'https://github.com/bogdanfinn/tls-client/releases/download/v1.11.2/tls-client-xgo-1.11.2-windows-amd64.dll', 'name': 'tls-client-xgo-1.11.2-windows-amd64.dll'}],
     }
 
+    @staticmethod
+    def _parse_version(version_string: str) -> Tuple[int, ...]:
+        """Converts a version string (e.g., "v1.11.2") to a comparable tuple (1, 11, 2)."""
+        try:
+            parts = version_string.lstrip('v').split('.')
+            return tuple(map(int, parts))
+        except (ValueError, AttributeError):
+            return 0, 0, 0
+
+    @staticmethod
+    def _parse_version_from_filename(filename: str) -> Tuple[int, ...]:
+        """Extracts and parses the version from a library filename."""
+        match = re.search(r'v?(\d+\.\d+\.\d+)', Path(filename).name)
+        if match:
+            return TLSLibrary._parse_version(match.group(1))
+        return 0, 0, 0
+
+    @classmethod
+    def cleanup_files(cls, keep_file: str = None):
+        """Removes all library files in the BIN_DIR except for the one to keep."""
+        for file_path in cls.find_all():
+            is_remove = True
+            if keep_file and Path(file_path).name == Path(keep_file).name:
+                is_remove = False
+
+            if is_remove:
+                try:
+                    os.remove(file_path)
+                    print(f"Removed old library file: {file_path}")
+                except OSError as e:
+                    print(f"Error removing old library file {file_path}: {e}")
+
     @classmethod
     def fetch_api(cls, version: str = None, retries: int = 3):
         def _find_release(data, version_: str = None):
@@ -250,11 +223,12 @@ def _find_release(data, version_: str = None):
         asset_urls, ubuntu_urls = [], []
         for _ in range(retries):
             try:
-                response = requests.get(GITHUB_API_URL)
-                if response.ok:
-                    _find_release(response.json())
-                    break
-
+                # Use standard library's urllib to fetch API data
+                with urllib.request.urlopen(GITHUB_API_URL, timeout=10) as response:
+                    if response.status == 200:
+                        content = response.read().decode('utf-8')
+                        _find_release(json.loads(content))
+                        break
             except Exception as ex:
                 print("Unable to fetch GitHub API: %s" % ex)
 
@@ -272,6 +246,7 @@ def find(cls) -> str:
         for fp in cls.find_all():
             if PATTERN_RE.search(fp):
                 return fp
+        return None
 
     @classmethod
     def find_all(cls) -> List[str]:
@@ -293,80 +268,111 @@ def download(cls, version: str = None) -> str:
                 )
             )
             download_url = None
-            for download_url in cls.fetch_api(version):
-                if download_url:
+            for url in cls.fetch_api(version):
+                if url:
+                    download_url = url
                     break
 
             print("Library Download URL: %s" % download_url)
             if download_url:
-                destination = os.path.join(BIN_DIR, download_url.split("/")[-1])
-                with requests.get(download_url, stream=True) as response:
-                    response.raise_for_status()
+                destination_name = download_url.split("/")[-1]
+                destination = os.path.join(BIN_DIR, destination_name)
+
+                # Use standard library's urllib to download the file
+                with urllib.request.urlopen(download_url, timeout=10) as response:
+                    if response.status != 200:
+                        raise urllib.error.URLError(f"Failed to download file: HTTP {response.status}")
+
                     os.makedirs(BIN_DIR, exist_ok=True)
                     total_size = int(response.headers.get("content-length", 0))
-                    chunk_size = 1024
-                    with open(
-                        os.path.join(BIN_DIR, download_url.split("/")[-1]), "wb"
-                    ) as file, tqdm(
-                        desc=destination,
-                        total=total_size,
-                        unit="iB",
-                        unit_scale=True,
-                        unit_divisor=chunk_size,
-                    ) as progress_bar:
-                        for chunk in response.iter_content(chunk_size):
-                            size = file.write(chunk)
-                            progress_bar.update(size)
-
+                    chunk_size = 8192  # 8KB
+
+                    with open(destination, "wb") as file:
+                        downloaded = 0
+                        while True:
+                            chunk = response.read(chunk_size)
+                            if not chunk:
+                                break
+
+                            file.write(chunk)
+                            downloaded += len(chunk)
+
+                            # Simple text-based progress bar
+                            if total_size > 0:
+                                percent = downloaded / total_size * 100
+                                bar_length = 50
+                                filled_length = int(bar_length * downloaded // total_size)
+                                bar = "=" * filled_length + '-' * (bar_length - filled_length)
+                                sys.stdout.write(f'\rDownloading {destination_name}: [{bar}] {percent:.1f}%')
+                                sys.stdout.flush()
+
+                print()  # Newline after download completes
                 return destination
 
-        except requests.exceptions.HTTPError as ex:
+        except (urllib.error.URLError, urllib.error.HTTPError) as ex:
             print("Unable to download file: %s" % ex)
+        except Exception as e:
+            print("An unexpected error occurred during download: %s" % e)
 
     @classmethod
     def set_path(cls, fp: str):
         cls._PATH = fp
 
     @classmethod
     def load(cls):
-        """Load libraries"""
+        """
+        Loads the TLS library. It checks for the correct version, downloads it if
+        the local version is outdated or missing, and then loads it into memory.
+        """
 
-        def _load_libraries(fp_):
+        def _load_library(fp_):
             try:
                 lib = ctypes.cdll.LoadLibrary(fp_)
                 cls.set_path(fp_)
+                print(f"Successfully loaded TLS library: {fp_}")
                 return lib
             except Exception as ex:
-                print("Unable to load TLS Library, details: %s" % ex)
+                print(f"Unable to load TLS library '{fp_}', details: {ex}")
                 try:
                     os.remove(fp_)
-                except FileNotFoundError:
+                except (FileNotFoundError, PermissionError):
                     pass
 
-        if cls._PATH is not None:
-            library = _load_libraries(cls._PATH)
-            if library:
-                return library
-
-        if TLS_LIBRARY_PATH:
-            library = _load_libraries(TLS_LIBRARY_PATH)
-            if library:
-                return library
-
-        for fp in cls.find_all():
-            if IS_UBUNTU and PATTERN_UBUNTU_RE.search(fp):
-                library = _load_libraries(fp)
-                if library:
-                    return library
-            if PATTERN_RE.search(fp):
-                library = _load_libraries(fp)
+        target_version = cls._parse_version(LATEST_VERSION_TAG_NAME)
+        print(f"Required library version: {LATEST_VERSION_TAG_NAME}")
+        local_files = cls.find_all()
+        newest_local_version = (0, 0, 0)
+        newest_local_file = None
+
+        if local_files:
+            for file_path in local_files:
+                file_version = cls._parse_version_from_filename(file_path)
+                if file_version > newest_local_version:
+                    newest_local_version = file_version
+                    newest_local_file = file_path
+            print(
+                f"Found newest local library: {newest_local_file} (version {'.'.join(map(str, newest_local_version))})")
+        else:
+            print("No local library found.")
+
+        if newest_local_version < target_version:
+            if newest_local_file:
+                print(f"Local library is outdated. Upgrading to {LATEST_VERSION_TAG_NAME}...")
+            else:
+                print(f"Downloading required library version {LATEST_VERSION_TAG_NAME}...")
+
+            downloaded_fp = cls.download(version=LATEST_VERSION_TAG_NAME)
+            if downloaded_fp:
+                cls.cleanup_files(keep_file=downloaded_fp)
+                library = _load_library(downloaded_fp)
                 if library:
                     return library
+            raise OSError("Failed to download the required TLS library.")
 
-        download_fp = cls.download()
-        if download_fp:
-            library = _load_libraries(download_fp)
+        if newest_local_file:
+            library = _load_library(newest_local_file)
             if library:
+                cls.cleanup_files(keep_file=newest_local_file)
                 return library
 
-        raise OSError("Your system does not support TLS Library.")
+        raise OSError("Could not find or load a compatible TLS library.")