vchrome 0.1.7__py3-none-any.whl → 0.1.9__py3-none-any.whl

vchrome/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.1.7'
+__version__ = '0.1.9'
 __author__ = 'v'
 # ----------------------------------------------------------------------------------------------------
 _allowed = {'Chrome'}
@@ -908,7 +908,7 @@ def cdp_client(hostname, port, debug=False, runtimeEnable=False, cfg={}):
                 "waitForDebuggerOnStart": True,  
                 "flatten": True,
             }, sessionId=sessionId)
-            self.f.cdp('DOM.enable', sessionId=sessionId)
+            # self.f.cdp('DOM.enable', sessionId=sessionId) # only call api. not listen events, no need enable.
             self.f.cdp('Page.enable', sessionId=sessionId)
             if runtimeEnable: self.f.cdp('Runtime.enable', sessionId=sessionId)
             self.f.add_sniff_session(sessionId)
@@ -1072,16 +1072,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 +1112,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 +1146,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
@@ -1162,13 +1162,14 @@ def cdp_client(hostname, port, debug=False, runtimeEnable=False, cfg={}):
                     px, py = x, y
                     if count > 1 or acount > 5:
                         break
-                if perf_counter() - start > timeout:
-                    raise Exception('wait show over time.')
+                else:
+                    if perf_counter() - start > timeout:
+                        raise Exception('wait show over time.')
                 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]
@@ -1318,7 +1319,8 @@ def cdp_client(hostname, port, debug=False, runtimeEnable=False, cfg={}):
         def __add__(self, other):
             einfo = self.r_obj('function(){return this["toString"]()}', objectId=self.objectId, returnByValue=False)
             return self.f._parse_js2py(einfo, self, iso=self.iso) + str(other)
-        text = property(lambda s:s['outerHTML'] or s['textContent'])
+        html = property(lambda s:s['outerHTML'] or s['textContent'])
+        text = property(lambda s:s['textContent'])
         previous = property(lambda s:s['previousElementSibling'])
         next = property(lambda s:s['nextElementSibling'])
         parent = property(lambda s:s['parentElement'])
@@ -1913,7 +1915,7 @@ def cdp_client(hostname, port, debug=False, runtimeEnable=False, cfg={}):
     class DOM:
         def __init__(self, f):
             self.f = f
-            self.f.cdp('DOM.enable')
+            # self.f.cdp('DOM.enable') # only call api. not listen events, no need enable.
     class Cache:
         def __init__(self, f):
             self.f = f
@@ -1926,8 +1928,9 @@ def cdp_client(hostname, port, debug=False, runtimeEnable=False, cfg={}):
                     self._cache_cdp(sessionId)
                 self.is_enable = True
         def _cache_cdp(self, sessionId):
-            self.f.cdp('Network.enable', sessionId=sessionId)
-            self.f.cdp('Storage.enable', sessionId=sessionId)
+            # self.f.cdp('Network.enable', sessionId=sessionId) # only call api. not listen events, no need enable.
+            # self.f.cdp('Storage.enable', sessionId=sessionId) # only call api. not listen events, no need enable.
+            pass
         def attach(self, f):
             f.clear_cache = self.clear_cache
         def add_cache_session(self, sessionId):
@@ -2802,6 +2805,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))
@@ -2809,6 +2813,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

{vchrome-0.1.7.dist-info → vchrome-0.1.9.dist-info}/METADATA

@@ -1,4 +1,4 @@
 Metadata-Version: 2.1
 Name: vchrome
-Version: 0.1.7
+Version: 0.1.9
 

vchrome-0.1.9.dist-info/RECORD

@@ -0,0 +1,6 @@
+v/__init__.py,sha256=6ZddLaDcwLudHWmFr2utAcYhperXw9AYoItNPm8EZSM,65
+vchrome/__init__.py,sha256=jSrnEZLp3_atYOrh3Sd-QF2n1ynTIwIuCGXnuXIR_DM,227216
+vchrome-0.1.9.dist-info/METADATA,sha256=s8cXPtNAplO0IEcCir-q9X-souSVzmAR4ocahqNlCFw,56
+vchrome-0.1.9.dist-info/WHEEL,sha256=hPN0AlP2dZM_3ZJZWP4WooepkmU9wzjGgCLCeFjkHLA,92
+vchrome-0.1.9.dist-info/top_level.txt,sha256=IYbkbnFb2FGoroYj_ZXIitmnJDgYBA29_HmK9BdEUkY,10
+vchrome-0.1.9.dist-info/RECORD,,

vchrome-0.1.7.dist-info/RECORD

@@ -1,6 +0,0 @@
-v/__init__.py,sha256=6ZddLaDcwLudHWmFr2utAcYhperXw9AYoItNPm8EZSM,65
-vchrome/__init__.py,sha256=Pmp8KIUPMjdmW-t6iyYnYy329l074Z7Y2FOVcCH2aL8,226660
-vchrome-0.1.7.dist-info/METADATA,sha256=g050rIVhk4jDo9duVobzL5OzMeQbyPErnIhiWZgtb4U,56
-vchrome-0.1.7.dist-info/WHEEL,sha256=hPN0AlP2dZM_3ZJZWP4WooepkmU9wzjGgCLCeFjkHLA,92
-vchrome-0.1.7.dist-info/top_level.txt,sha256=IYbkbnFb2FGoroYj_ZXIitmnJDgYBA29_HmK9BdEUkY,10
-vchrome-0.1.7.dist-info/RECORD,,