From 3670096f26fd38ce784d964214a147e244fb5ff9 Mon Sep 17 00:00:00 2001
From: monosans <hsyqixco@protonmail.com>
Date: Wed, 4 Jan 2023 20:24:44 +0300
Subject: [PATCH] Use DummyCookieJar

---
 proxy_scraper_checker/proxy.py                 | 12 ++++++++++--
 proxy_scraper_checker/proxy_scraper_checker.py | 18 +++++++++++++-----
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/proxy_scraper_checker/proxy.py b/proxy_scraper_checker/proxy.py
index 1d5a1c0..58e44cb 100644
--- a/proxy_scraper_checker/proxy.py
+++ b/proxy_scraper_checker/proxy.py
@@ -4,6 +4,7 @@ import asyncio
 from time import perf_counter
 
 from aiohttp import ClientSession
+from aiohttp.abc import AbstractCookieJar
 from aiohttp_socks import ProxyConnector, ProxyType
 
 
@@ -15,12 +16,19 @@ class Proxy:
         self.port = port
 
     async def check(
-        self, *, sem: asyncio.Semaphore, proto: str, timeout: float
+        self,
+        *,
+        sem: asyncio.Semaphore,
+        cookie_jar: AbstractCookieJar,
+        proto: str,
+        timeout: float,
     ) -> None:
         async with sem:
             start = perf_counter()
             async with self.get_connector(proto) as connector:
-                async with ClientSession(connector=connector) as session:
+                async with ClientSession(
+                    connector=connector, cookie_jar=cookie_jar
+                ) as session:
                     async with session.get(
                         "http://ip-api.com/json/?fields=8217",
                         timeout=timeout,
diff --git a/proxy_scraper_checker/proxy_scraper_checker.py b/proxy_scraper_checker/proxy_scraper_checker.py
index b268278..8c324d4 100644
--- a/proxy_scraper_checker/proxy_scraper_checker.py
+++ b/proxy_scraper_checker/proxy_scraper_checker.py
@@ -18,7 +18,7 @@ from typing import (
     Union,
 )
 
-from aiohttp import ClientSession
+from aiohttp import ClientSession, DummyCookieJar
 from rich.console import Console
 from rich.progress import (
     BarColumn,
@@ -46,6 +46,7 @@ class ProxyScraperChecker:
     __slots__ = (
         "all_folders",
         "console",
+        "cookie_jar",
         "enabled_folders",
         "path",
         "proxies_count",
@@ -132,6 +133,7 @@ class ProxyScraperChecker:
             proto: set() for proto in self.sources
         }
         self.proxies_count = {proto: 0 for proto in self.sources}
+        self.cookie_jar = DummyCookieJar()
         self.console = console or Console()
         self.sem = asyncio.Semaphore(max_connections)
 
@@ -189,7 +191,6 @@ class ProxyScraperChecker:
             source: Proxy list URL.
             proto: HTTP/SOCKS4/SOCKS5.
         """
-        source = source.strip()
         try:
             async with session.get(source, timeout=15) as response:
                 status = response.status
@@ -217,11 +218,16 @@ class ProxyScraperChecker:
     ) -> None:
         """Check if proxy is alive."""
         try:
-            await proxy.check(sem=self.sem, proto=proto, timeout=self.timeout)
+            await proxy.check(
+                sem=self.sem,
+                cookie_jar=self.cookie_jar,
+                proto=proto,
+                timeout=self.timeout,
+            )
         except Exception as e:
             # Too many open files
             if isinstance(e, OSError) and e.errno == 24:
-                logging.error("Please, set MaxConnections to lower value.")
+                logger.error("Please, set MaxConnections to lower value.")
 
             self.proxies[proto].remove(proxy)
         progress.update(task, advance=1)
@@ -239,7 +245,9 @@ class ProxyScraperChecker:
                 + " Gecko/20100101 Firefox/108.0"
             )
         }
-        async with ClientSession(headers=headers) as session:
+        async with ClientSession(
+            headers=headers, cookie_jar=self.cookie_jar
+        ) as session:
             coroutines = (
                 self.fetch_source(
                     session=session,