vchrome 0.0.16__py3-none-any.whl → 0.0.17__py3-none-any.whl

vchrome/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.0.16'
+__version__ = '0.0.17'
 __author__ = 'v'
 # ----------------------------------------------------------------------------------------------------
 _allowed = {'Chrome'}
@@ -1930,6 +1930,7 @@ def cdp_client(hostname, port, debug=False):
             c._js2py = self.f._js2py
             c.tabs = self.f.root.tabs
             c.quit = self.f.root.quit
+            c.open_devtools = self.f.open_devtools
             c.press = self.f.press
             c.release = self.f.release
             c.id = self.f.id
@@ -2129,6 +2130,17 @@ def cdp_client(hostname, port, debug=False):
             self.keyboard = Keyboard(self)
         def press(self, key): self.cdp('Input.dispatchKeyEvent', self.keyboard._make_down(key))
         def release(self, key): self.cdp('Input.dispatchKeyEvent', self.keyboard._make_up(key))
+        def open_devtools(self, show=False):
+            url = 'devtools://devtools/bundled/inspector.html?ws=' + self.wsinfo['webSocketDebuggerUrl'].split('//', 1)[-1]
+            wslist = myget(wurl)
+            has_open = False
+            for wsinfo in wslist:
+                if wsinfo.get('url') == url:
+                    has_open = True
+                    break
+            if not has_open:
+                t = self.root.rootchrome.new_tab(show)
+                t.get(url)
         def close(self):
             self.cdp('Target.closeTarget', {"targetId": self.frameId})
             while self.closer.toggle:
@@ -2218,6 +2230,7 @@ def cdp_client(hostname, port, debug=False):
                 self._wok_script.append(script)
             else:
                 raise Exception('type must in (page/worker) default is page.')
+            self.init_once = False
         def _page_init_js(self, sessionId=None):
             if self._doc_script:
                 for s in self._doc_script:
@@ -2299,9 +2312,9 @@ def cdp_client(hostname, port, debug=False):
                 self.e.ws.close()
             self.e = e
     class Root:
-        def __init__(self, verison, iframes):
+        def __init__(self, version, iframes):
             self.pool = Pool(10)
-            self.verison = verison
+            self.version = version
             self.iframes = iframes
             self.active = None
             self.detached_cache_sessionId = {}
@@ -2311,7 +2324,7 @@ def cdp_client(hostname, port, debug=False):
             self.tabs = []
             self.is_init = True
             self.init_sign = 0
-            self.ws = create_connection_saf(verison['webSocketDebuggerUrl'], enable_multithread=True, suppress_origin=True)
+            self.ws = create_connection_saf(version['webSocketDebuggerUrl'], enable_multithread=True, suppress_origin=True)
             self.logger = Logger('[[ ---------- ROOT ---------- ]]', debug)
             self.cdper = CoreCDP(self, self.ws, self, self.logger)
             self.cdper.attach(self)
@@ -2471,10 +2484,10 @@ def cdp_client(hostname, port, debug=False):
     wslist = myget(wurl)
     for idx in range(len(wslist)):
         wslist[idx]['webSocketDebuggerUrl'] = adj_wsurl(wslist[idx]['webSocketDebuggerUrl'])
-    verison = myget(wvurl)
-    verison['webSocketDebuggerUrl'] = adj_wsurl(verison['webSocketDebuggerUrl'])
+    version = myget(wvurl)
+    version['webSocketDebuggerUrl'] = adj_wsurl(version['webSocketDebuggerUrl'])
     iframes = [i for i in wslist if i['type'] == 'iframe']
-    root = Root(verison, iframes)
+    root = Root(version, iframes)
     for wsinfo in wslist: RootFrame(wsinfo, root)
     start = perf_counter()
     while root.init_sign:
@@ -2643,7 +2656,7 @@ class Chrome:
             hostname = '127.0.0.1',
             user_path = None,
             use_system_user_path = False, 
-            verison_check = True,
+            version_check = True,
             headless = False,
             incognito = False,
             user_agent = None,
@@ -2654,7 +2667,7 @@ class Chrome:
         ):
         self.debug = Debug(debug)
         self.path = find_chrome(path)
-        self.verison_check = verison_check
+        self.version_check = version_check
         self.headless = headless
         self.user_agent = user_agent
         self.incognito = incognito
@@ -2739,9 +2752,9 @@ class Chrome:
     platform = property(lambda s:s.get_platform(), lambda s,v:s.set_platform(v))
     def _check_lower_version(self):
         try:
-            verison = self.dr.root.verison
-            if verison and verison.get('Browser'):
-                ver = int(verison.get('Browser').split('/')[-1].split('.')[0])
+            version = self.dr.root.version
+            if version and version.get('Browser'):
+                ver = int(version.get('Browser').split('/')[-1].split('.')[0])
                 # Restricting Chrome versions to prevent abnormal states
                 if ver < 100:
                     return True
@@ -2756,8 +2769,8 @@ class Chrome:
         if not self.dr:
             raise Exception('maybe single devtools not close.')
         self.dr.browser.attach(self)
-        if self.verison_check and self._check_lower_version():
-            raise Exception('chrome verison is less then 100. not reliable. you can set (verison_check=False) for ignore this alert.')
+        if self.version_check and self._check_lower_version():
+            raise Exception('chrome version is less then 100. not reliable. you can set (version_check=False) for ignore this alert.')
         if self.debug.mouse:
             jscode = r'''
             function f(e){
@@ -4305,4 +4318,4 @@ class WebSocketApp:
             except Exception as e:
                 _logging.error(f'error from callback {callback}: {e}')
                 if self.on_error:
-                    self.on_error(self, e)
+                    self.on_error(self, e)

{vchrome-0.0.16.dist-info → vchrome-0.0.17.dist-info}/METADATA

@@ -1,4 +1,4 @@
 Metadata-Version: 2.1
 Name: vchrome
-Version: 0.0.16
+Version: 0.0.17
 

vchrome-0.0.17.dist-info/RECORD

@@ -0,0 +1,6 @@
+v/__init__.py,sha256=6DurnAoxIMJqDiwNpfsnSnHSysKaZO33FFF4aRJR1Qg,108
+vchrome/__init__.py,sha256=TPHiPMCANh8HGZ3vw0nGxHeDUaV2rzD39EWAAsaPVcU,222137
+vchrome-0.0.17.dist-info/METADATA,sha256=8UnspeHU0D9LeD66Rs26az3npJyHZq2wFj024_CSTso,57
+vchrome-0.0.17.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+vchrome-0.0.17.dist-info/top_level.txt,sha256=IYbkbnFb2FGoroYj_ZXIitmnJDgYBA29_HmK9BdEUkY,10
+vchrome-0.0.17.dist-info/RECORD,,

vchrome-0.0.16.dist-info/RECORD

@@ -1,6 +0,0 @@
-v/__init__.py,sha256=6DurnAoxIMJqDiwNpfsnSnHSysKaZO33FFF4aRJR1Qg,108
-vchrome/__init__.py,sha256=XXig0wh1XDewBpfcj0vtd_FmAKbO1Y5Gss1-JfJmyMY,221557
-vchrome-0.0.16.dist-info/METADATA,sha256=6KXJkfLHI485HjRNCVJp5dOsSTEnI1Sn2bIfaBxWTgQ,57
-vchrome-0.0.16.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-vchrome-0.0.16.dist-info/top_level.txt,sha256=IYbkbnFb2FGoroYj_ZXIitmnJDgYBA29_HmK9BdEUkY,10
-vchrome-0.0.16.dist-info/RECORD,,