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

vchrome/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.1.8'
+__version__ = '0.1.10'
 __author__ = 'v'
 # ----------------------------------------------------------------------------------------------------
 _allowed = {'Chrome'}
@@ -15,6 +15,7 @@ import copy
 import types
 import queue
 import time
+import ast
 import inspect
 import textwrap
 import threading
@@ -252,6 +253,18 @@ def cdp_client(hostname, port, debug=False, runtimeEnable=False, cfg={}):
             return data
         if is_err:
             raise Exception(is_err)
+    def has_print(func):
+        try:
+            if not func:
+                return False
+            code = textwrap.dedent(inspect.getsource(func))
+            tree = ast.parse(code)
+            for node in ast.walk(tree):
+                if isinstance(node, ast.Call):
+                    if isinstance(node.func, ast.Name) and node.func.id == "print":
+                        return True
+        except:
+            return False
     def is_function(obj):
         return type(obj) == types.FunctionType or type(obj) == types.MethodType
     def create_connection_saf(*a, **kw):
@@ -402,6 +415,7 @@ 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',{
@@ -431,6 +445,10 @@ def cdp_client(hostname, port, debug=False, runtimeEnable=False, cfg={}):
             self.call_listen[pk] = [waiter, on_request, on_response]
             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
             return waiter
         def _handle_network(self):
             self.f.set_method_callback('Network.requestWillBeSent', self.Network_requestWillBeSent)
@@ -453,8 +471,11 @@ 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 on_request(r):
-                                waiter.add(r)
+                            if self.call_listen_lock[k] & 1:
+                                with rl:
+                                    if on_request(r): waiter.add(r)
+                            else:
+                                if on_request(r): waiter.add(r)
         def Network_requestWillBeSentExtraInfo(self, rdata):
             request_extra = rdata['params']
             requestId = request_extra['requestId']
@@ -467,8 +488,11 @@ 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 on_request(r):
-                                waiter.add(r)
+                            if self.call_listen_lock[k] & 1:
+                                with rl:
+                                    if on_request(r): waiter.add(r)
+                            else:
+                                if on_request(r): waiter.add(r)
             else:
                 self.info_listen[requestId] = {}
                 self.info_listen[requestId]['request_extra'] = request_extra
@@ -504,8 +528,11 @@ 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 on_response(r):
-                            waiter.add(r)
+                        if self.call_listen_lock[k] & 2:
+                            with rl:
+                                if on_response(r): waiter.add(r)
+                        else:
+                            if on_response(r): waiter.add(r)
                         self.info_listen.pop(requestId, None)
                         self.qlist.get('V')
         def Network_loadingFailed(self, rdata):
@@ -682,6 +709,7 @@ 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',{
@@ -712,6 +740,10 @@ def cdp_client(hostname, port, debug=False, runtimeEnable=False, cfg={}):
             self.call_change[pk] = [waiter, on_request, on_response]
             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
             return waiter
         def _handle_fetch(self):
             self.f.set_method_callback('Fetch.requestPaused', self.Fetch_requestPaused)
@@ -738,8 +770,11 @@ def cdp_client(hostname, port, debug=False, runtimeEnable=False, cfg={}):
                         })
                         if on_request:
                             try:
-                                if on_request(x):
-                                    waiter.add(x)
+                                if self.call_change_lock[k] & 1:
+                                    with rl:
+                                        if on_request(x): waiter.add(x)
+                                else:
+                                    if on_request(x): waiter.add(x)
                             except:
                                 self.f.logger.log('[ERROR] in request on_request', traceback.format_exc())
                                 continue
@@ -771,6 +806,15 @@ def cdp_client(hostname, port, debug=False, runtimeEnable=False, cfg={}):
                                 self.f.logger.log('[ERROR] in request on_request continue', traceback.format_exc())
                 self.f.cdp('Fetch.continueRequest', {'requestId': requestId}, sessionId=rdata.get('sessionId'))
             else:
+                # request: Redirect.
+                if 'responseHeaders' in rdata['params'] and type(rdata['params']['responseHeaders']) == list:
+                    for kv in rdata['params']['responseHeaders']:
+                        if kv['name'] == 'Location':
+                            return self.f.cdp('Fetch.continueRequest', {'requestId': requestId, 'url':kv['value']}, sessionId=rdata.get('sessionId'))
+                # request: fail Request.
+                if 'responseErrorReason' in rdata['params']:
+                    return self.f.cdp('Fetch.failRequest', {'requestId': requestId, 'errorReason':rdata['params']['responseErrorReason']}, sessionId=rdata.get('sessionId'))
+                # response
                 for k in self.call_change_keys:
                     if self._match_url(self.call_change_vals[k], url):
                         waiter, on_request, on_response = self.call_change[k]
@@ -785,8 +829,11 @@ def cdp_client(hostname, port, debug=False, runtimeEnable=False, cfg={}):
                                 "request": SniffFetch.FetchRequest(rdata['params']['request'])
                             })
                             try:
-                                if on_response(x):
-                                    waiter.add(x)
+                                if self.call_change_lock[k] & 2:
+                                    with rl:
+                                        if on_response(x): waiter.add(x)
+                                else:
+                                    if on_response(x): waiter.add(x)
                             except:
                                 self.f.logger.log('[ERROR] in response on_response', traceback.format_exc())
                                 continue
@@ -1072,16 +1119,16 @@ def cdp_client(hostname, port, debug=False, runtimeEnable=False, cfg={}):
             return self.f.cdp('DOM.getBoxModel', {'objectId': self.objectId})
         def __repr__(self):
             return '<DOM:[{}] [{}]>'.format(self.className, self.objectId)
-        def clear(self, delay_uptime=0.15, timegap=0.01):
-            self.wait_show()
+        def clear(self, delay_uptime=0.15, timegap=0.01, timeout=15):
+            self.wait_show(timeout)
             self.f.cdp('DOM.focus', {"objectId": self.objectId})
             clear_ents = self.f.rootf.make_clear()
             for kdn in clear_ents[:2]: time.sleep(timegap); self.f.cdp('Input.dispatchKeyEvent', kdn)
             time.sleep(delay_uptime)
             for kup in clear_ents[2:4]: time.sleep(timegap); self.f.cdp('Input.dispatchKeyEvent', kup)
             for delt in clear_ents[4:]: time.sleep(timegap); self.f.cdp('Input.dispatchKeyEvent', delt)
-        def input(self, str, delay_time=0.02, delay_uptime=0.15, random_gap=0.01):
-            self.wait_show()
+        def input(self, str, delay_time=0.02, delay_uptime=0.15, random_gap=0.01, timeout=15):
+            self.wait_show(timeout)
             self.f.cdp('DOM.focus', {"objectId": self.objectId})
             for kdn, kup in self.f.rootf.make_input_events(str):
                 if kdn == 'insertText':
@@ -1112,8 +1159,8 @@ def cdp_client(hostname, port, debug=False, runtimeEnable=False, cfg={}):
             return _x, _y
         def _set_in_view(self):
             self.f.cdp('DOM.scrollIntoViewIfNeeded', {"objectId": self.objectId})
-        def click(self, x=1, y=2, zero='center', button='left', count=1):
-            self.wait_show()
+        def click(self, x=1, y=2, zero='center', button='left', count=1, timeout=15):
+            self.wait_show(timeout)
             self._set_in_view()
             _x, _y = self._get_xy(x, y, zero)
             self.f.cdp('Input.dispatchMouseEvent',{"buttons":0,"type":"mouseMoved","x":_x,"y":_y,"button":"none","clickCount":0})
@@ -1146,7 +1193,7 @@ def cdp_client(hostname, port, debug=False, runtimeEnable=False, cfg={}):
                     y += points[i][1]*B
                 r.append([x, y])
             return r
-        def wait_show(self, timeout=5, pretime=0.1):
+        def wait_show(self, timeout=15, pretime=0.1):
             start = perf_counter()
             count, acount = 0, 0
             px, py = 0, 0
@@ -1168,8 +1215,8 @@ def cdp_client(hostname, port, debug=False, runtimeEnable=False, cfg={}):
                 time.sleep(0.08)
             if pretime:
                 time.sleep(pretime) # When the component appears, the event might not have been attached yet. Please wait a moment.
-        def drag(self, x=1, y=2, zero='center', button='left', count=1):
-            self.wait_show()
+        def drag(self, x=1, y=2, zero='center', button='left', count=1, timeout=15):
+            self.wait_show(timeout)
             self._set_in_view()
             x, y = self._get_xy(x, y, zero)
             self.cache_xy = [x, y]
@@ -2805,6 +2852,7 @@ class Chrome:
             userAgent = property(lambda s:s.get_userAgent(), lambda s,v:s.set_userAgent(v))
             languages = property(lambda s:s.get_languages(), lambda s,v:s.set_languages(v))
             platform = property(lambda s:s.get_platform(), lambda s,v:s.set_platform(v))
+            html = property(lambda s:s['document']['documentElement']['outerHTML'])
         return Chrome(self.root, self.dr.root._new_driver(not foreground))
     frames = property(lambda s:s.dr.frames)
     cookies = property(lambda s:s.get_cookies(), lambda s,v:s.set_cookies(v))
@@ -2812,6 +2860,7 @@ class Chrome:
     userAgent = property(lambda s:s.get_userAgent(), lambda s,v:s.set_userAgent(v))
     languages = property(lambda s:s.get_languages(), lambda s,v:s.set_languages(v))
     platform = property(lambda s:s.get_platform(), lambda s,v:s.set_platform(v))
+    html = property(lambda s:s['document']['documentElement']['outerHTML'])
     def _check_lower_version(self):
         try:
             version = self.dr.root.version
@@ -2833,6 +2882,7 @@ class Chrome:
     def _connect(self):
         v_cfg = {}
         v_cfg['headless'] = self.headless
+        v_cfg['proxy'] = self.proxy
         v_cfg_fpath = self.user_path / 'v_config.json'
         if not is_port_open(self.port):
             self._init()
@@ -2841,8 +2891,9 @@ class Chrome:
             v_cfg = self.loadSaveF(v_cfg_fpath, v_cfg)
         else:
             self.writeSaveF(v_cfg_fpath, v_cfg)
-        if v_cfg['headless'] != self.headless:
+        if v_cfg.get('headless', 'v') != self.headless or v_cfg.get('proxy', 'v') != self.proxy:
             v_cfg['headless'] = self.headless
+            v_cfg['proxy'] = self.proxy
             self.root = cdp_client(self.hostname, port=self.port, debug=self.debug, runtimeEnable=self.runtimeEnable, cfg=v_cfg)
             self.root.active.quit()
             self._init()

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

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

vchrome-0.1.10.dist-info/RECORD

@@ -0,0 +1,6 @@
+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,,

vchrome-0.1.8.dist-info/RECORD

@@ -1,6 +0,0 @@
-v/__init__.py,sha256=6ZddLaDcwLudHWmFr2utAcYhperXw9AYoItNPm8EZSM,65
-vchrome/__init__.py,sha256=3Y9tBJV5R1aId75qSUdN0PKGrTmoYgE7jz4VobzOCQQ,226977
-vchrome-0.1.8.dist-info/METADATA,sha256=hk-Kct-6jTMpTF4sQAy_daHA6HNkBaBXYoVC18WdVYw,56
-vchrome-0.1.8.dist-info/WHEEL,sha256=hPN0AlP2dZM_3ZJZWP4WooepkmU9wzjGgCLCeFjkHLA,92
-vchrome-0.1.8.dist-info/top_level.txt,sha256=IYbkbnFb2FGoroYj_ZXIitmnJDgYBA29_HmK9BdEUkY,10
-vchrome-0.1.8.dist-info/RECORD,,