isrpa 1.0.2__py3-none-any.whl → 1.0.4__py3-none-any.whl

isrpa/utils.py

@@ -27,14 +27,19 @@ def getPath(user_name):
     if response.status_code != 200:
         return "failure"
     port = response.json()
-    url = f"http://localhost:{port}/json/version"
-    response = requests.get(url)
-    if response.status_code != 200:
-        return "failure"
-    return response.json().get('webSocketDebuggerUrl')
+
+    def get_ws_url():
+        url = f"http://localhost:{port}/json/version"
+        response = requests.get(url)
+        if response.status_code != 200:
+            return "failure"
+        return response.json().get('webSocketDebuggerUrl')
+
+    ws_url = get_ws_url()
+    return ws_url
 
 
-def get_active_page(browser, user_name):
+def get_active_url(user_name):
     """
     获取当前激活page对象
     """
@@ -45,17 +50,28 @@ def get_active_page(browser, user_name):
     if response.status_code != 200:
         return "failure"
     port = response.json()
-    url = f"http://localhost:{port}/json"
-    response = requests.get(url)
-    if response.status_code != 200:
-        return "failure"
-    for t in response.json():
-        if t.get("type") == "page":
-            active_url = t.get("url")
-            for page in browser.contexts[0].pages:
-                if page.url == active_url:
-                    page.bring_to_front()
-                    return page
+
+    def get_json():
+        url = f"http://localhost:{port}/json"
+        response = requests.get(url)
+        if response.status_code != 200:
+            return "failure"
+        return response.json()
+
+    data = get_json()
+    if data:
+        return data[0].get("url")
+    return None
+
+
+def get_active_page(browser, active_url):
+    """
+    获取当前激活page对象
+    """
+    for page in browser.contexts[0].pages:
+        if page.url == active_url:
+            page.bring_to_front()
+            return page
 
 
 def upload_file(file_path, dest_file, user_name):

{isrpa-1.0.2.dist-info → isrpa-1.0.4.dist-info}/METADATA

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

{isrpa-1.0.2.dist-info → isrpa-1.0.4.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=eUgdX1g6zt36zu05oXo2jwyT77n_rXn-gnyR8pwZLOE,3791
-isrpa-1.0.2.dist-info/METADATA,sha256=IPFbiotwSPElQviy5CpyuAeO88BEuZz95FmsAHLbkIo,511
-isrpa-1.0.2.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-isrpa-1.0.2.dist-info/top_level.txt,sha256=J5HJbtR2WAeKnW1rrpkiuapwnlswv3RgM-riyZD87o0,6
-isrpa-1.0.2.dist-info/RECORD,,
+isrpa/utils.py,sha256=y24xUNheQP89D0tityC7uDztJwCuItor4eJucHoqpFA,3996
+isrpa-1.0.4.dist-info/METADATA,sha256=Eb2LwO4tVLsGeLQNaTpx8X99p6KuQhLGv9xXyMf5DNc,511
+isrpa-1.0.4.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+isrpa-1.0.4.dist-info/top_level.txt,sha256=J5HJbtR2WAeKnW1rrpkiuapwnlswv3RgM-riyZD87o0,6
+isrpa-1.0.4.dist-info/RECORD,,