isrpa 1.0.8__py3-none-any.whl → 1.1.0__py3-none-any.whl

isrpa/utils.py

@@ -73,7 +73,7 @@ def get_ssh_path(user_name):
     return ws_url
 
 
-def get_active_url(user_name):
+def get_url(user_name):
     """
     获取当前激活page对象
     """
@@ -108,13 +108,50 @@ def get_active_url(user_name):
                 return page.get("url")
     return None
 
+def get_active_url(user_name):
+    """
+    获取当前激活page对象
+    """
+    url = f"{address}/client/getPath"
+    headers = {'Content-Type': 'application/json'}
+    data = {'user_name': user_name}
+    response = requests.post(url, headers=headers, json=data)
+    if response.status_code != 200:
+        return "failure"
+    data = response.json()
+    port = data.get('port')
+
+    def get_json():
+        url = f"http://localhost:{port}/json"
+        response = requests.get(url)
+        if response.status_code != 200:
+            return "failure"
+        return response.json()
+
+    pages = get_json()
+    if pages:
+        for page in pages:
+            if (
+                    page.get("url").startswith("chrome-extension://") or
+                    page.get("url").startswith("chrome-untrusted://") or
+                    page.get("title") == "MagicalAutomator-sidePanel"
+            ):
+                continue
+            # else:
+            #     if page.get("url") == "chrome://newtab/":
+            #         return "chrome://new-tab-page/"
+            return page.get("id")
+    return None
+
 
-def get_active_page(browser, active_url):
+def get_active_page(browser, active_page_id):
     """
     获取当前激活page对象
     """
     for page in browser.contexts[0].pages:
-        if page.url == active_url:
+        client = page.context.new_cdp_session(page)
+        target_info = client.send("Target.getTargetInfo")
+        if target_info.get('targetInfo').get('targetId') == active_page_id:
             page.bring_to_front()
             return page
 

{isrpa-1.0.8.dist-info → isrpa-1.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: isrpa
-Version: 1.0.8
+Version: 1.1.0
 Summary: isrpa package
 Home-page: https://github.com/yourusername/mypackage
 Author: ysq

{isrpa-1.0.8.dist-info → isrpa-1.1.0.dist-info}/RECORD

@@ -5,8 +5,8 @@ isrpa/__init__.py,sha256=pG-YPVG0gJIJ6s4xcAz9S_CnUxpUcz33wl9eNUSgxGk,20
 isrpa/credentials.py,sha256=5paT4rxtZIUPqADmi1bLkoSKEYoosgS7rIjrJsgMNIs,3350
 isrpa/llm_chat.py,sha256=jTuK9wcm3X36V9lXuGuTCdNup_zi2NeG2GuYHzO7gm4,1541
 isrpa/message.py,sha256=N0s6hMaC5S-Pi4EhwcSp-ngfBTBQyW6ymU9sI9dUSeE,11329
-isrpa/utils.py,sha256=mXRTyp63Ycwp_ae4-2uCDz1mmehtlkTRmw_AL2AguVI,5524
-isrpa-1.0.8.dist-info/METADATA,sha256=Z1JIk12dgN2Kmexo33WxLm0zTcN9F1exgXwRtdg5HiI,511
-isrpa-1.0.8.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-isrpa-1.0.8.dist-info/top_level.txt,sha256=J5HJbtR2WAeKnW1rrpkiuapwnlswv3RgM-riyZD87o0,6
-isrpa-1.0.8.dist-info/RECORD,,
+isrpa/utils.py,sha256=tN270H9E_NK3bc-FnUX0fONjvb52yskBBMD0pUMf-ug,6819
+isrpa-1.1.0.dist-info/METADATA,sha256=jeFGuZLYUJ42huP0r-gliPCx6yvoMhhbAnUKpypIQJ0,511
+isrpa-1.1.0.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+isrpa-1.1.0.dist-info/top_level.txt,sha256=J5HJbtR2WAeKnW1rrpkiuapwnlswv3RgM-riyZD87o0,6
+isrpa-1.1.0.dist-info/RECORD,,