Get mitmproxy working in a thread

Author: wkeeling

.travis.yml

@@ -4,8 +4,6 @@ python:
 - 3.8
 - 3.7
 - 3.6
-- 3.5
-- 3.4
 
 cache: pip
 

CONTRIBUTING.rst

@@ -102,7 +102,7 @@ Before you submit a pull request, check that it meets these guidelines:
 2. If the pull request adds functionality, the docs should be updated. Put
    your new functionality into a function with a docstring, and add the
    feature to the list in README.rst.
-3. The pull request should work for Python 3.4, 3.5, 3.6 and 3.7, and for PyPy. Check
+3. The pull request should work for Python 3.6, 3.7 and 3.8, and for PyPy. Check
    https://travis-ci.org/wkeeling/selenium-wire/pull_requests
    and make sure that the tests pass for all supported Python versions.
 

README.rst

@@ -11,7 +11,7 @@ With Selenium Wire, you author your tests in just the same way as you do with Se
 .. image:: https://codecov.io/gh/wkeeling/selenium-wire/branch/master/graph/badge.svg
         :target: https://codecov.io/gh/wkeeling/selenium-wire
 
-.. image:: https://img.shields.io/badge/python-3.4%2C%203.5%2C%203.6%2C%203.7%2C%203.8-blue.svg
+.. image:: https://img.shields.io/badge/python-3.6%2C%203.7%2C%203.8-blue.svg
         :target: https://pypi.python.org/pypi/selenium-wire
 
 .. image:: https://img.shields.io/pypi/v/selenium-wire.svg
@@ -68,7 +68,7 @@ Features
 Compatibilty
 ~~~~~~~~~~~~
 
-* Python 3.4+
+* Python 3.6+
 * Selenium 3.4.0+
 * Firefox, Chrome, Safari and Edge are supported
 
@@ -744,28 +744,6 @@ The code above will print something like this to the console (loading a page wil
     }
     driver = webdriver.Firefox(seleniumwire_options=options)
 
-``mitmproxy_log_level``
-    Set the log level that the mitmproxy backend will use. The default is ``ERROR``.
-    *Applies to the mitmproxy backend only.*
-
-.. code:: python
-
-    options = {
-        'mitmproxy_log_level': 'INFO'  # Increase the log level to INFO for the mitmproxy backend
-    }
-    driver = webdriver.Firefox(seleniumwire_options=options)
-
-``mitmproxy_confdir``
-    The location of the mitmproxy configuration directory. The default is ``~/.mitmproxy``. You might want to change this if you're running in an environment where you don't have access to the user's home folder.
-    *Applies to the mitmproxy backend only.*
-
-.. code:: python
-
-    options = {
-        'mitmproxy_confdir': '/tmp/.mitmproxy'  # Switch the location to /tmp
-    }
-    driver = webdriver.Firefox(seleniumwire_options=options)
-
 ``port``
     The port number that Selenium Wire's backend listens on. You don't normally need to specify a port as a random port number is chosen automatically.
 

requirements_dev.txt

@@ -1,11 +1,11 @@
-pip==9.0.1
-bumpversion==0.5.3
-wheel==0.30.0
-watchdog==0.8.3
-flake8==3.5.0
-tox==3.16.1
-coverage==4.5.1
-Sphinx==1.7.1
-twine==1.10.0
+pip
+bumpversion
+wheel
+watchdog
+flake8
+tox
+coverage
+Sphinx
+twine
 nose
 mitmproxy

seleniumwire/__init__.py

@@ -3,4 +3,4 @@
 """Top-level package for Selenium Wire."""
 
 __author__ = """Will Keeling"""
-__version__ = '2.1.2'
+__version__ = '3.0.0'

seleniumwire/proxy/client.py

@@ -53,22 +53,25 @@ def create_proxy(self, addr='127.0.0.1', port=0, options=None):
                 self._capture_request_handler = CaptureRequestHandler
                 # Set the timeout here before the handler starts executing
                 self._capture_request_handler.timeout = options.get('connection_timeout', 5)
-            self._proxy = ProxyHTTPServer((addr, port), self._capture_request_handler, options=options)
+
+            self._proxy = ProxyHTTPServer(addr, port, self._capture_request_handler, options=options)
 
             t = threading.Thread(name='Selenium Wire Proxy Server', target=self._proxy.serve_forever)
             t.daemon = not options.get('standalone')
             t.start()
 
-            socketname = self._proxy.socket.getsockname()
-            self._proxy_addr = socketname[0]
-            self._proxy_port = socketname[1]
+            self._proxy_addr, self._proxy_port = self._proxy.address()
         elif options.get('backend') == 'mitmproxy':
             # Use mitmproxy if installed
             from . import mitmproxy
 
-            self._proxy = mitmproxy.start(addr, port, options)
-            self._proxy_addr = self._proxy.host
-            self._proxy_port = self._proxy.port
+            self._proxy = mitmproxy.MitmProxy(addr, port, options)
+
+            t = threading.Thread(name='Selenium Wire Proxy Server', target=self._proxy.serve)
+            t.daemon = not options.get('standalone')
+            t.start()
+
+            self._proxy_addr, self._proxy_port = self._proxy.address()
         else:
             raise TypeError(
                 "Invalid backend '{}'. "

seleniumwire/proxy/handler.py

@@ -215,6 +215,8 @@ def _create_response(self, body, content_type='application/json'):
     def initialise(self, options):
         """Perform any initialisation actions.
 
+        DEPRECATED
+
         Args:
             options: The selenium wire options.
         """
@@ -237,7 +239,7 @@ def capture_request(self, request):
         """
         ignore_method = request.method in self.options.get(
             'ignore_http_methods', ['OPTIONS'])
-        not_in_scope = not self._in_scope(self.scopes, request.url)
+        not_in_scope = not self.in_scope(self.scopes, request.url)
         if ignore_method or not_in_scope:
             log.debug('Not capturing %s request: %s', request.method, request.url)
             return
@@ -258,7 +260,7 @@ def capture_response(self, request_id, url, response):
         log.info('Capturing response: %s %s %s', url, response.status_code, response.reason)
         self.storage.save_response(request_id, response)
 
-    def _in_scope(self, scopes, url):
+    def in_scope(self, scopes, url):
         if not scopes:
             return True
         elif not is_list_alike(scopes):
@@ -366,10 +368,10 @@ def _create_request(self, req, req_body):
     @property
     def options(self):
         return self.server.options
-
-    @options.setter
-    def options(self, options):
-        self.server.options = options
+    #
+    # @options.setter
+    # def options(self, options):
+    #     self.server.options = options
 
     @property
     def scopes(self):
@@ -382,18 +384,18 @@ def scopes(self, scopes):
     @property
     def modifier(self):
         return self.server.modifier
-
-    @modifier.setter
-    def modifier(self, modifier):
-        self.server.modifier = modifier
+    #
+    # @modifier.setter
+    # def modifier(self, modifier):
+    #     self.server.modifier = modifier
 
     @property
     def storage(self):
         return self.server.storage
-
-    @storage.setter
-    def storage(self, storage):
-        self.server.storage = storage
+    #
+    # @storage.setter
+    # def storage(self, storage):
+    #     self.server.storage = storage
 
     @property
     def certdir(self):