isrpa 1.0.3__py3-none-any.whl → 1.0.5__py3-none-any.whl

isrpa/utils.py

@@ -20,13 +20,44 @@ def getPath(user_name):
     :param port:
     :return:
     """
+
+    # address = os.environ.get("address", "192.168.12.249")
+
+    url = f"{address}/client/getPath"
+    headers = {
+        'Content-Type': 'application/json',  # 说明请求体是 JSON 格式
+    }
+    # 请求体的数据
+    data = {
+        'user_name': user_name
+    }
+    response = requests.post(url, headers=headers, json=data)
+    if response.status_code != 200:
+        return "failure"
+    data = response.json()
+    return f"ws://{data.get('ip_address')}:{data.get('port')}"
+
+
+def get_ssh_path(user_name):
+    """
+        环境变量设置
+        windows
+        setx address "192.168.12.249"
+
+        linux
+        export address = "192.168.12.249"
+        source /etc/profile
+    :param port:
+    :return:
+    """
     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"
-    port = response.json()
+    data = response.json()
+    port = data.get('port')
 
     def get_ws_url():
         url = f"http://localhost:{port}/json/version"
@@ -39,7 +70,7 @@ def getPath(user_name):
     return ws_url
 
 
-def get_active_page(browser, user_name):
+def get_active_url(user_name):
     """
     获取当前激活page对象
     """
@@ -49,7 +80,8 @@ def get_active_page(browser, user_name):
     response = requests.post(url, headers=headers, json=data)
     if response.status_code != 200:
         return "failure"
-    port = response.json()
+    data = response.json()
+    port = data.get('port')
 
     def get_json():
         url = f"http://localhost:{port}/json"
@@ -59,14 +91,19 @@ def get_active_page(browser, user_name):
         return response.json()
 
     data = get_json()
+    if data:
+        return data[0].get("url")
+    return None
+
 
-    for t in data:
-        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_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.3.dist-info → isrpa-1.0.5.dist-info}/METADATA

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

{isrpa-1.0.3.dist-info → isrpa-1.0.5.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=N2reQBnyLAfnWzvtFrH0pybF7x6HvPvs3gsVVyqbLNA,3971
-isrpa-1.0.3.dist-info/METADATA,sha256=bfZ55Csi8oRoVEQhlHO_cMFxpSc5vnfa2w-9NY6VV0Q,511
-isrpa-1.0.3.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-isrpa-1.0.3.dist-info/top_level.txt,sha256=J5HJbtR2WAeKnW1rrpkiuapwnlswv3RgM-riyZD87o0,6
-isrpa-1.0.3.dist-info/RECORD,,
+isrpa/utils.py,sha256=7gtqQhWaQezuOO9WcS03TN6meqNYD8bAgn4NK7yqxDc,4815
+isrpa-1.0.5.dist-info/METADATA,sha256=Isa7hR1IkpzD9lCotUpEC0ORXxK_N2NIf0tp6BVmesU,511
+isrpa-1.0.5.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+isrpa-1.0.5.dist-info/top_level.txt,sha256=J5HJbtR2WAeKnW1rrpkiuapwnlswv3RgM-riyZD87o0,6
+isrpa-1.0.5.dist-info/RECORD,,