fixed checkers

Author: DevAlone

checkers/base_checker.py

@@ -110,11 +110,11 @@ async def _request(self, proxy_address, timeout) -> tuple:
             async with session.request(
                     self.request_type, self.url, proxy=proxy_address, timeout=timeout, headers=headers) as \
                     response:
-                is_working = await self._check(response, checker_result)
+                is_working = await self.validate(response, checker_result)
 
         return is_working, checker_result
 
-    async def _check(self, response: aiohttp.ClientResponse, checker_result: CheckerResult) -> bool:
+    async def validate(self, response: aiohttp.ClientResponse, checker_result: CheckerResult) -> bool:
         """
         Implement this method. It will get response from url with http method you provided in constructor
 

checkers/d3d_info_checker.py

@@ -7,5 +7,5 @@ class D3DInfoChecker(BaseChecker):
     def __init__(self, timeout=None):
         super(D3DInfoChecker, self).__init__("https://test.d3d.info/ok.html", timeout=timeout)
 
-    async def _check(self, response: aiohttp.ClientResponse, checker_result: CheckerResult):
+    async def validate(self, response: aiohttp.ClientResponse, checker_result: CheckerResult):
         return (await response.text()).strip().lower() == 'ok'

checkers/google_com_checker.py

@@ -0,0 +1,15 @@
+import aiohttp
+
+from checkers.base_checker import BaseChecker, CheckerResult
+
+
+class GoogleComChecker(BaseChecker):
+    def __init__(self, timeout=None):
+        super(GoogleComChecker, self).__init__("https://google.com", timeout=timeout)
+
+    async def validate(self, response: aiohttp.ClientResponse, checker_result: CheckerResult):
+        '''
+        We have already done the request and it was successful,
+        Google returned something(maybe good response, maybe captcha, we don't care)
+        '''
+        return True

checkers/ipinfo_io_checker.py

@@ -6,7 +6,7 @@ class IPInfoIOChecker(BaseChecker):
     def __init__(self, timeout=None):
         super(IPInfoIOChecker, self).__init__("https://ipinfo.io/json", timeout=timeout)
 
-    async def _check(self, response: aiohttp.ClientResponse, checker_result: CheckerResult) -> bool:
+    async def validate(self, response: aiohttp.ClientResponse, checker_result: CheckerResult) -> bool:
         if response.status != 200:
             return False
 

proxy_py/_settings.py

@@ -1,5 +1,4 @@
-from checkers.d3d_info_checker import D3DInfoChecker
-# from checkers.ipinfo_io_checker import IPInfoIOChecker
+from checkers.google_com_checker import GoogleComChecker
 
 
 # enable to get more information in logs
@@ -65,8 +64,7 @@
 MINIMUM_NUMBER_OF_CHECKERS_PER_PROXY = 1
 
 PROXY_CHECKERS = [
-    # IPInfoIOChecker,
-    D3DInfoChecker,
+    GoogleComChecker,
 ]
 
 """

statistics/statistics.py

@@ -1,6 +1,5 @@
 from models import Proxy, ProxyCountItem, NumberOfProxiesToProcess, db
 from models import CollectorState, NumberOfCollectorsToProcess, ProcessorProxiesQueueSize
-from processor import Processor
 from proxy_py import settings
 import time
 import asyncio