vchrome 0.0.4__py3-none-any.whl → 0.0.6__py3-none-any.whl

vchrome/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.0.4'
+__version__ = '0.0.6'
 __author__ = 'v'
 # ----------------------------------------------------------------------------------------------------
 _allowed = {'Chrome'}
@@ -72,7 +72,7 @@ def cdp_client(hostname, port, debug=False):
             self.indent = 44
             if self.debug:
                 monkey_print()
-        def log(*a):
+        def log(self, *a):
             print(*a)
         def __call__(self, tp, a):
             if self.debug:
@@ -85,20 +85,20 @@ def cdp_client(hostname, port, debug=False):
                         cse = c.get('sessionId')
                         cmd = c.get('method')
                         if self.debug(cmd):
-                            print(self._T('c', cse), '[<={:3}] {}'.format(id, cmd).ljust(self.indent, ' '), self._L(a, 'result'))
+                            self.log(self._T('c', cse), '[<={:3}] {}'.format(id, cmd).ljust(self.indent, ' '), self._L(a, 'result'))
                     if md: 
                         if self.debug(md):
-                            print(self._T('i', se), (' '*8 + md).ljust(self.indent, ' '), self._L(a, 'params'))
+                            self.log(self._T('i', se), (' '*8 + md).ljust(self.indent, ' '), self._L(a, 'params'))
                 elif tp == 'req':
                     id = a.get('id')
                     md = a.get('method')
                     se = a.get('sessionId')
                     if self.debug(md):
                         self._C(id, a)
-                        print(self._T('c', se), '[->{:3}] {}'.format(id, md).ljust(self.indent, ' '), self._L(a, 'params'))
+                        self.log(self._T('c', se), '[->{:3}] {}'.format(id, md).ljust(self.indent, ' '), self._L(a, 'params'))
                 else:
                     if self.debug.rest:
-                        print(self._T('i'), (' '*8 + tp).ljust(self.indent, ' '), a)
+                        self.log(self._T('i'), (' '*8 + tp).ljust(self.indent, ' '), a)
     class Pool:
         import queue, time, traceback
         from threading import Thread, main_thread
@@ -807,22 +807,25 @@ def cdp_client(hostname, port, debug=False):
             if self.f.root.filter_extension(tinfo): 
                 self.f.root._del_init_check()
                 return
+            # TODO 
+            # need to be compatible with service_worker in the future
             if rdata['params'].get('targetInfo', {}).get('type') == 'service_worker':
                 self.f.root._del_init_check()
                 return
-            # TODO 
-            # need to be compatible with workers in the future
             if rdata['params'].get('targetInfo', {}).get('type') == 'worker':
-                # and rdata['params'].get('targetInfo', {}).get('title', '').startswith('blob'):
+                sessionId = rdata['params']['sessionId']
+                self.f.cdp('Runtime.enable', sessionId=sessionId)
+                self.f._work_init_js(sessionId=sessionId)
+                self.f.cdp('Runtime.runIfWaitingForDebugger', sessionId=sessionId)
                 self.f.root._del_init_check()
                 return
             frameId = tinfo['targetId']
             sessionId = rdata['params']['sessionId']
-            # self.f.cdp("Target.setAutoAttach", {
-            #     "autoAttach": True,  
-            #     "waitForDebuggerOnStart": True,  
-            #     "flatten": True,
-            # }, sessionId=sessionId)
+            self.f.cdp("Target.setAutoAttach", {
+                "autoAttach": True,  
+                "waitForDebuggerOnStart": True,  
+                "flatten": True,
+            }, sessionId=sessionId)
             self.f.cdp('DOM.enable', sessionId=sessionId)
             self.f.cdp('Page.enable', sessionId=sessionId)
             self.f.cdp('Runtime.enable', sessionId=sessionId)
@@ -846,7 +849,7 @@ def cdp_client(hostname, port, debug=False):
             self.f.root._del_init_check()
         def Target_detachedFromTarget(self, rdata):
             sessionId = rdata['params']['sessionId']
-            pass
+            self.f.root.detached_cache_sessionId[sessionId] = perf_counter()
         def Target_targetCreated(self, rdata):
             pass
         def Target_targetInfoChanged(self, rdata):
@@ -1689,7 +1692,8 @@ def cdp_client(hostname, port, debug=False):
             #     "positionY": 200,
             #     }, sessionId=sessionId)
     class CoreCDP:
-        def __init__(self, ws, root, logger=None):
+        def __init__(self, f, ws, root, logger=None):
+            self.f = f
             self.ws = ws
             self.root = root
             self.logger = logger or (lambda *a,**kw:None)
@@ -1698,6 +1702,7 @@ def cdp_client(hostname, port, debug=False):
             self.qret = {}
             self.irun = {}
             self._start()
+            self._cache_del = []
         def _start(self):
             self.is_running = True
             self.loop_recv = Thread(target=self.start_loop)
@@ -1764,6 +1769,13 @@ def cdp_client(hostname, port, debug=False):
         def get_xid(self):
             self.xid += 1
             return self.xid
+        def check_del_cache(self):
+            if self._cache_del:
+                _rid, _tid, cache_obj = self._cache_del[-1]
+                if perf_counter() - _rid > 30:
+                    self._cache_del.pop()
+                    if _tid in cache_obj:
+                        del cache_obj[_tid]
         def cdp(self, protocal, data={}, sessionId=None, no_wait=False, limit_time=None):
             rid = self.get_id()
             cmd = { "id": rid, "method": protocal, "params": data }
@@ -1792,6 +1804,21 @@ def cdp_client(hostname, port, debug=False):
                         if perf_counter() - start > limit_time:
                             self.qret.pop(rid, None)
                             return {'vvv': 'over time'}
+                    if sessionId:
+                        _tid = sessionId
+                        _rid = self.root.detached_cache_sessionId.get(_tid, None)
+                        if _rid:
+                            self._cache_del.append([_rid, _tid, self.root.detached_cache_sessionId])
+                            self.qret.pop(rid, None)
+                            return {'vvv': 'detached sessionId'}
+                    else:
+                        _tid = getattr(self.f, 'frameId', None)
+                        _rid = self.root.detached_cache_targetId.get(_tid, None)
+                        if _rid:
+                            self._cache_del.append([_rid, _tid, self.root.detached_cache_targetId])
+                            self.qret.pop(rid, None)
+                            return {'vvv': 'detached targetId'}
+                    self.check_del_cache()
                     ret = self.qret[rid].get(timeout=.15)
                     self.qret.pop(rid, None)
                     return try_run_result(ret)
@@ -1934,6 +1961,7 @@ def cdp_client(hostname, port, debug=False):
             self.type = wsinfo['type']
             self.frames = []
             self._doc_script = []
+            self._wok_script = []
             self.url = wsinfo.get('url')
             self.parent = None
             self.init_once = False
@@ -1942,7 +1970,7 @@ def cdp_client(hostname, port, debug=False):
             self.sessionId = None # Used to maintain consistency with CDPTools objects
             self.contextId = None # Used to maintain consistency with CDPTools objects
             self.iso_contextId = None # Used to maintain consistency with CDPTools objects
-            self.cdper = CoreCDP(self.ws, self.root, self.logger)
+            self.cdper = CoreCDP(self, self.ws, self.root, self.logger)
             self.cdper.attach(self)
             if is_auto_create: self._run_init_once()
             self.root.add_root_frame(self)
@@ -2043,12 +2071,21 @@ def cdp_client(hostname, port, debug=False):
                     break
             f = self.cdp("Page.getFrameTree")
             self.url = f['frameTree']['frame']['url']
-        def init_js(self, script):
-            self._doc_script.append(script)
+        def init_js(self, script, type='page'):
+            if type == 'page':
+                self._doc_script.append(script)
+            elif type == 'worker':
+                self._wok_script.append(script)
+            else:
+                raise Exception('type must in (page/worker) default is page.')
         def _page_init_js(self, sessionId=None):
             if self._doc_script:
                 for s in self._doc_script:
                     self.cdp('Page.addScriptToEvaluateOnNewDocument', {"source": s}, sessionId=sessionId)
+        def _work_init_js(self, sessionId=None):
+            if self._wok_script:
+                for s in self._wok_script:
+                    self.cdp('Runtime.evaluate', {"expression": s}, sessionId=sessionId)
         def tree_view(self):
             r = ''
             def print_tree(f, level=0, prefix=''):
@@ -2072,7 +2109,7 @@ def cdp_client(hostname, port, debug=False):
             self.iso_contextId = None # Used to maintain consistency with CDPTools objects
             self.ws = create_connection_saf(wsinfo['webSocketDebuggerUrl'], enable_multithread=True, suppress_origin=True)
             self.logger = Logger(wsinfo['id'], debug)
-            self.cdper = CoreCDP(self.ws, self.root, self.logger)
+            self.cdper = CoreCDP(self, self.ws, self.root, self.logger)
             self.cdper.attach(self)
             self.cdp('Runtime.enable')
             self.tools = CDPTools(self, self)
@@ -2124,10 +2161,11 @@ def cdp_client(hostname, port, debug=False):
     class Root:
         def __init__(self, verison, iframes):
             self.pool = Pool(10)
-            self.id = 0
             self.verison = verison
             self.iframes = iframes
             self.active = None
+            self.detached_cache_sessionId = {}
+            self.detached_cache_targetId = {}
             self.new_tab_frame = {}
             self.create_tab_must_be_single = queue.Queue(1)
             self.tabs = []
@@ -2135,7 +2173,7 @@ def cdp_client(hostname, port, debug=False):
             self.init_sign = 0
             self.ws = create_connection_saf(verison['webSocketDebuggerUrl'], enable_multithread=True, suppress_origin=True)
             self.logger = Logger('[[ ---------- ROOT ---------- ]]', debug)
-            self.cdper = CoreCDP(self.ws, self, self.logger)
+            self.cdper = CoreCDP(self, self.ws, self, self.logger)
             self.cdper.attach(self)
             self.extension = ExtensionManager(self)
             self.extension.set_extension(self._get_extension())
@@ -2145,6 +2183,7 @@ def cdp_client(hostname, port, debug=False):
                 "flatten": True,
             })
             self.set_method_callback('Target.attachedToTarget', self.Target_attachedToTarget)
+            self.set_method_callback('Target.detachedFromTarget', self.Target_detachedFromTarget)
             # self.cdp("Target.setDiscoverTargets", { "discover": True })
         def filter_extension(self, tinfo):
             return tinfo['url'].startswith('chrome-extension://') and tinfo['url'].endswith('/vvv.js')
@@ -2176,6 +2215,9 @@ def cdp_client(hostname, port, debug=False):
                         'type': tinfo['type'],
                         'url': tinfo['url'],
                     }, self)
+        def Target_detachedFromTarget(self, rdata):
+            targetId = rdata['params']['targetId']
+            self.detached_cache_targetId[targetId] = perf_counter()
         def Target_attachedToTarget(self, rdata):
             params = rdata['params']
             sessionId = params.get('sessionId')
@@ -2207,9 +2249,6 @@ def cdp_client(hostname, port, debug=False):
         def _del_init_check(self):
             if self.is_init:
                 self.init_sign -= 1
-        def get_new_id(self):
-            self.id += 1
-            return self.id
         def add_root_frame(self, f):
             if not self.active and f.type == 'page':
                 self.active = f

{vchrome-0.0.4.dist-info → vchrome-0.0.6.dist-info}/METADATA

@@ -1,3 +1,3 @@
 Metadata-Version: 2.4
 Name: vchrome
-Version: 0.0.4
+Version: 0.0.6

vchrome-0.0.6.dist-info/RECORD

@@ -0,0 +1,5 @@
+vchrome/__init__.py,sha256=LehDiIhsxdw_sRHslCqcrW21btiPNSXsN65u4uJdwjQ,208869
+vchrome-0.0.6.dist-info/METADATA,sha256=ubvdFQ7Lj9XQPSrQkvQz7PR18_vXebRpkS9IHl__0iU,54
+vchrome-0.0.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+vchrome-0.0.6.dist-info/top_level.txt,sha256=oB919Fa09PCy48Ptj8iy-1QUcvhEeY97MOR42281Fk0,8
+vchrome-0.0.6.dist-info/RECORD,,

vchrome-0.0.4.dist-info/RECORD

@@ -1,5 +0,0 @@
-vchrome/__init__.py,sha256=jr8vqeslue8Qsks_Q8u8Hil5EGfJv9ZwTozKgWbF1A8,206643
-vchrome-0.0.4.dist-info/METADATA,sha256=naCPRYBSrjbxNhwRaaccILJPsCYF5Re_Yh6mGtJnAfI,54
-vchrome-0.0.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-vchrome-0.0.4.dist-info/top_level.txt,sha256=oB919Fa09PCy48Ptj8iy-1QUcvhEeY97MOR42281Fk0,8
-vchrome-0.0.4.dist-info/RECORD,,