vchrome 0.1.10__py3-none-any.whl → 0.1.11__py3-none-any.whl

vchrome/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.1.10'
+__version__ = '0.1.11'
 __author__ = 'v'
 # ----------------------------------------------------------------------------------------------------
 _allowed = {'Chrome'}
@@ -415,7 +415,6 @@ def cdp_client(hostname, port, debug=False, runtimeEnable=False, cfg={}):
             self.call_listen = {}
             self.call_listen_keys = []
             self.call_listen_vals = {}
-            self.call_listen_lock = {}
             self.tools = SniffTools(self)
         def _listen_cdp(self, sessionId):
             self.f.cdp('Network.enable',{
@@ -446,9 +445,7 @@ def cdp_client(hostname, port, debug=False, runtimeEnable=False, cfg={}):
             self.call_listen_keys = self.call_listen.keys()
             self.call_listen_vals[pk] = [pattern, is_regex]
             # To make it easier to synchronize function printing (if there are print calls within the function).
-            self.call_listen_lock[pk] = 0
-            if has_print(on_request): self.call_listen_lock[pk] = self.call_listen_lock[pk] | 1
-            if has_print(on_response): self.call_listen_lock[pk] = self.call_listen_lock[pk] | 2
+            if has_print(on_request) or has_print(on_response): monkey_print()
             return waiter
         def _handle_network(self):
             self.f.set_method_callback('Network.requestWillBeSent', self.Network_requestWillBeSent)
@@ -471,11 +468,7 @@ def cdp_client(hostname, port, debug=False, runtimeEnable=False, cfg={}):
                         waiter, on_request, on_response = self.call_listen[k]
                         if on_request:
                             r = SniffNetwork.NetworkRequest(self.info_listen[requestId])
-                            if self.call_listen_lock[k] & 1:
-                                with rl:
-                                    if on_request(r): waiter.add(r)
-                            else:
-                                if on_request(r): waiter.add(r)
+                            if on_request(r): waiter.add(r)
         def Network_requestWillBeSentExtraInfo(self, rdata):
             request_extra = rdata['params']
             requestId = request_extra['requestId']
@@ -488,11 +481,7 @@ def cdp_client(hostname, port, debug=False, runtimeEnable=False, cfg={}):
                         waiter, on_request, on_response = self.call_listen[k]
                         if on_request:
                             r = SniffNetwork.NetworkRequest(self.info_listen[requestId])
-                            if self.call_listen_lock[k] & 1:
-                                with rl:
-                                    if on_request(r): waiter.add(r)
-                            else:
-                                if on_request(r): waiter.add(r)
+                            if on_request(r): waiter.add(r)
             else:
                 self.info_listen[requestId] = {}
                 self.info_listen[requestId]['request_extra'] = request_extra
@@ -528,11 +517,7 @@ def cdp_client(hostname, port, debug=False, runtimeEnable=False, cfg={}):
                         rbody = self.f.cdp('Network.getResponseBody', {"requestId": requestId}, sessionId=rdata.get('sessionId'), limit_time=3)
                         self.info_listen[requestId]['response_body'] = rbody
                         r = SniffNetwork.NetworkResponse(self.info_listen[requestId])
-                        if self.call_listen_lock[k] & 2:
-                            with rl:
-                                if on_response(r): waiter.add(r)
-                        else:
-                            if on_response(r): waiter.add(r)
+                        if on_response(r): waiter.add(r)
                         self.info_listen.pop(requestId, None)
                         self.qlist.get('V')
         def Network_loadingFailed(self, rdata):
@@ -548,8 +533,7 @@ def cdp_client(hostname, port, debug=False, runtimeEnable=False, cfg={}):
                     if on_response:
                         self.qlist.put('V')
                         r = SniffNetwork.NetworkResponse(self.info_listen[requestId])
-                        if on_response(r):
-                            waiter.add(r)
+                        if on_response(r): waiter.add(r)
                         self.qlist.get('V')
     class SniffFetch:
         class FetchFakeResponse:
@@ -709,7 +693,6 @@ def cdp_client(hostname, port, debug=False, runtimeEnable=False, cfg={}):
             self.call_change = {}
             self.call_change_keys = []
             self.call_change_vals = {}
-            self.call_change_lock = {}
             self.tools = SniffTools(self)
         def _change_cdp(self, sessionId):
             self.f.cdp('Fetch.enable',{
@@ -741,9 +724,7 @@ def cdp_client(hostname, port, debug=False, runtimeEnable=False, cfg={}):
             self.call_change_keys = self.call_change.keys()
             self.call_change_vals[pk] = [pattern, is_regex]
             # To make it easier to synchronize function printing (if there are print calls within the function).
-            self.call_change_lock[pk] = 0
-            if has_print(on_request): self.call_change_lock[pk] = self.call_change_lock[pk] | 1
-            if has_print(on_response): self.call_change_lock[pk] = self.call_change_lock[pk] | 2
+            if has_print(on_request) or has_print(on_response): monkey_print()
             return waiter
         def _handle_fetch(self):
             self.f.set_method_callback('Fetch.requestPaused', self.Fetch_requestPaused)
@@ -770,11 +751,7 @@ def cdp_client(hostname, port, debug=False, runtimeEnable=False, cfg={}):
                         })
                         if on_request:
                             try:
-                                if self.call_change_lock[k] & 1:
-                                    with rl:
-                                        if on_request(x): waiter.add(x)
-                                else:
-                                    if on_request(x): waiter.add(x)
+                                if on_request(x): waiter.add(x)
                             except:
                                 self.f.logger.log('[ERROR] in request on_request', traceback.format_exc())
                                 continue
@@ -829,11 +806,7 @@ def cdp_client(hostname, port, debug=False, runtimeEnable=False, cfg={}):
                                 "request": SniffFetch.FetchRequest(rdata['params']['request'])
                             })
                             try:
-                                if self.call_change_lock[k] & 2:
-                                    with rl:
-                                        if on_response(x): waiter.add(x)
-                                else:
-                                    if on_response(x): waiter.add(x)
+                                if on_response(x): waiter.add(x)
                             except:
                                 self.f.logger.log('[ERROR] in response on_response', traceback.format_exc())
                                 continue
@@ -1980,16 +1953,22 @@ def cdp_client(hostname, port, debug=False, runtimeEnable=False, cfg={}):
             pass
         def attach(self, f):
             f.clear_cache = self.clear_cache
+            f.reset = self.reset
         def add_cache_session(self, sessionId):
             self.cache_sesslist.append(sessionId)
             if self.is_enable:
                 self._cache_cdp(sessionId)
-        def clear_cache(self):
+        def reset(self):
             self._enable()
             for sessionId in self.cache_sesslist:
                 self.f.cdp('Network.clearBrowserCookies',sessionId=sessionId)
                 self.f.cdp('Storage.clearDataForOrigin', {'origin':'*','storageTypes':'local_storage,session_storage,indexeddb'},sessionId=sessionId);
             return self.f
+        def clear_cache(self):
+            self._enable()
+            for sessionId in self.cache_sesslist:
+                self.f.cdp('Network.clearBrowserCache',sessionId=sessionId)
+            return self.f
     class Browser:
         def __init__(self, f):
             self.f = f
@@ -2006,6 +1985,7 @@ def cdp_client(hostname, port, debug=False, runtimeEnable=False, cfg={}):
             c.listen = self.f.listen
             c.intercept = self.f.intercept
             c.clear_cache = self.f.clear_cache
+            c.reset = self.f.reset
             c.js = self.f.run_js
             c._js2py = self.f._js2py
             c.tabs = self.f.root.tabs

{vchrome-0.1.10.dist-info → vchrome-0.1.11.dist-info}/METADATA

@@ -1,4 +1,4 @@
 Metadata-Version: 2.1
 Name: vchrome
-Version: 0.1.10
+Version: 0.1.11
 

vchrome-0.1.11.dist-info/RECORD

@@ -0,0 +1,6 @@
+v/__init__.py,sha256=6ZddLaDcwLudHWmFr2utAcYhperXw9AYoItNPm8EZSM,65
+vchrome/__init__.py,sha256=9LYqVSuZahcPySY1fQZseDU8bR2gYVFlpm7GkZiJjrM,229000
+vchrome-0.1.11.dist-info/METADATA,sha256=xrfKhZxjyhM4rF6QQDkl4t_LTKPwvIMEr7I8MPexovQ,57
+vchrome-0.1.11.dist-info/WHEEL,sha256=hPN0AlP2dZM_3ZJZWP4WooepkmU9wzjGgCLCeFjkHLA,92
+vchrome-0.1.11.dist-info/top_level.txt,sha256=IYbkbnFb2FGoroYj_ZXIitmnJDgYBA29_HmK9BdEUkY,10
+vchrome-0.1.11.dist-info/RECORD,,

vchrome-0.1.10.dist-info/RECORD

@@ -1,6 +0,0 @@
-v/__init__.py,sha256=6ZddLaDcwLudHWmFr2utAcYhperXw9AYoItNPm8EZSM,65
-vchrome/__init__.py,sha256=aMD6Ua-33LnoLUcyX5mu7FKffntOAWa84b2GpQyExec,230224
-vchrome-0.1.10.dist-info/METADATA,sha256=1cFcdEsGP3QhKOSGQbkP1RM_AjwxrIDXLgNeb89C2Ng,57
-vchrome-0.1.10.dist-info/WHEEL,sha256=hPN0AlP2dZM_3ZJZWP4WooepkmU9wzjGgCLCeFjkHLA,92
-vchrome-0.1.10.dist-info/top_level.txt,sha256=IYbkbnFb2FGoroYj_ZXIitmnJDgYBA29_HmK9BdEUkY,10
-vchrome-0.1.10.dist-info/RECORD,,