Server choosing was been added. Check callback was been added. #RC-252

Author: iamarkadiypolukhin

twocaptcha/api.py

@@ -12,6 +12,10 @@ class ApiException(Exception):
 
 
 class ApiClient():
+    def __init__(self, post_url = '2captcha.com'):
+        self.post_url = post_url
+        
+        
     def in_(self, files={}, **kwargs):
         '''
         
@@ -39,10 +43,11 @@ def in_(self, files={}, **kwargs):
         '''
 
         try:
+            current_url = 'https://'+self.post_url+'/in.php'
             if files:
 
                 files = {key: open(path, 'rb') for key, path in files.items()}
-                resp = requests.post('https://2captcha.com/in.php',
+                resp = requests.post(current_url,
                                      data=kwargs,
                                      files=files)
 
@@ -51,12 +56,12 @@ def in_(self, files={}, **kwargs):
             elif 'file' in kwargs:
 
                 with open(kwargs.pop('file'), 'rb') as f:
-                    resp = requests.post('https://2captcha.com/in.php',
+                    resp = requests.post(current_url,
                                          data=kwargs,
                                          files={'file': f})
 
             else:
-                resp = requests.post('https://2captcha.com/in.php',
+                resp = requests.post(current_url,
                                      data=kwargs)
 
         except requests.RequestException as e:
@@ -96,7 +101,8 @@ def res(self, **kwargs):
         '''
 
         try:
-            resp = requests.get('https://2captcha.com/res.php', params=kwargs)
+            current_url_out = 'https://'+self.post_url+'/res.php'
+            resp = requests.get(current_url_out, params=kwargs)
 
             if resp.status_code != 200:
                 raise NetworkException(f'bad response: {resp.status_code}')

twocaptcha/solver.py

@@ -37,16 +37,16 @@ def __init__(self,
                  callback=None,
                  defaultTimeout=120,
                  recaptchaTimeout=600,
-                 pollingInterval=10):
+                 pollingInterval=10,
+                 server = '2captcha.com'):
 
         self.API_KEY = apiKey
         self.soft_id = softId
         self.callback = callback
         self.default_timeout = defaultTimeout
         self.recaptcha_timeout = recaptchaTimeout
         self.polling_interval = pollingInterval
-
-        self.api_client = ApiClient()
+        self.api_client = ApiClient(post_url = str(server))
         self.max_files = 9
         self.exceptions = SolverExceptions
 
@@ -396,14 +396,13 @@ def solve(self, timeout=0, polling_interval=0, **kwargs):
         id_ = self.send(**kwargs)
         result = {'captchaId': id_}
 
-        if self.has_callback:
-            return result
+        if self.callback is None:
 
-        timeout = float(timeout or self.default_timeout)
-        sleep = int(polling_interval or self.polling_interval)
+            timeout = float(timeout or self.default_timeout)
+            sleep = int(polling_interval or self.polling_interval)
 
-        code = self.wait_result(id_, timeout, sleep)
-        result.update({'code': code})
+            code = self.wait_result(id_, timeout, sleep)
+            result.update({'code': code})
 
         return result