ascript 1.3.1__tar.gz → 1.3.3__tar.gz

{ascript-1.3.1 → ascript-1.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ascript
-Version: 1.3.1
+Version: 1.3.3
 Summary: Ascript Developer Library
 License: MIT
 Classifier: Operating System :: Microsoft :: Windows

{ascript-1.3.1 → ascript-1.3.3}/ascript/windows/system/env.py

@@ -10,6 +10,36 @@ from pkginfo import Wheel  # 确保主环境已安装 pkginfo
 import urllib
 
 
+CREATE_NEW_CONSOLE = 0x00000010
+CREATE_NO_WINDOW = 0x08000000
+
+# 这些环境变量如果泄漏进 venv 的 python.exe, 会让它去加载用户机器上
+# 另一个 Python 安装的 stdlib / site-packages, ABI 不匹配直接 SEH 崩溃, 表现就是
+# "Python 已停止工作" 弹窗 (无 stderr, 无退出码可追). 调用 venv 子进程前一律剥掉.
+_PYTHON_ENV_VARS_TO_STRIP = (
+    "PYTHONHOME",
+    "PYTHONPATH",
+    "PYTHONSTARTUP",
+    "PYTHONUSERBASE",
+    "PYTHONEXECUTABLE",
+    "__PYVENV_LAUNCHER__",
+)
+
+
+def _clean_env() -> dict:
+    env = os.environ.copy()
+    for k in _PYTHON_ENV_VARS_TO_STRIP:
+        env.pop(k, None)
+    return env
+
+
+# 进程全局: 让子进程崩溃以退出码体现, 而不是 Windows 接管弹"调试/关闭程序"对话框
+# (那对话框会把 stderr 一并埋掉). SetErrorMode 影响整个进程, 在模块加载时设一次即可.
+if sys.platform == "win32":
+    # SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX | SEM_NOOPENFILEERRORBOX
+    ctypes.windll.kernel32.SetErrorMode(0x0001 | 0x0002 | 0x8000)
+
+
 class EnvManager:
     """用户虚拟环境管理器。
 
@@ -214,48 +244,88 @@ class EnvManager:
         return best_url
 
     def _execute_combined_install(self, user_id, wheel_path, env_dir, show_console):
-        """执行虚拟环境创建和 wheel 包安装的组合命令。
-
-        通过一条 cmd 命令依次完成虚拟环境创建和包安装，失败时会在控制台显示错误信息。
+        """分三步部署: 创建 venv → 自检 venv python.exe → pip 安装 wheel。
 
-        Args:
-            user_id: 用户唯一标识，用于窗口标题显示。
-            wheel_path: .whl 安装包的文件路径。
-            env_dir: 虚拟环境目标目录路径。
-            show_console: 是否显示控制台窗口。
+        关键是把曾经的 "cmd /s /c virtualenv && pip install" 拆开 —— 那种串法任一步
+        崩了 stderr 都会被外层 cmd 吞掉, 用户只看到 "Python 已停止工作" 这种无法定位
+        的提示。拆开后每一步独立 subprocess + capture, 用户能拿到具体退出码 + stderr。
 
         Raises:
-            RuntimeError: 安装命令执行失败时抛出。
+            RuntimeError: 任一步骤失败, message 含退出码 + stderr 尾部。
         """
         abs_env_dir = os.path.abspath(env_dir)
         abs_wheel_path = os.path.abspath(wheel_path)
+        venv_python = self.get_python_exe(user_id)
         pip_path = self.get_pip_exe(user_id)
+        env = _clean_env()
 
-        # 1. 动态测速获取最优源
-        index_url = self._get_best_index()
-        print(f"[{user_id}] 自动择源完成，选用: {index_url}")
-
-        # 2. 构造 pip 参数
-        # 这里顺带保留了之前你 launcher 里的 timeout 逻辑（如果有的话）
-        timeout = getattr(self, 'config', {}).get('timeout', 15)
-        extra_args = f"-i {index_url} --default-timeout {timeout}"
-
-        combined_payload = (
-            f'title 正在初始化运行环境 - {user_id} && '
-            f'"{sys.executable}" -m virtualenv "{abs_env_dir}" && '
-            f'title 正在安装插件依赖 - {user_id} && '
-            f'"{pip_path}" install --no-cache-dir {extra_args} "{abs_wheel_path}" '
-            f'|| (echo. && echo ------------------------------------------------ && '
-            f'echo [错误] 部署失败！请查看上方红字报错原因。 && '
-            f'echo 解决后关闭此窗口，重新启动程序即可。 && '
-            f'echo ------------------------------------------------ && pause && exit 1)'
+        r = subprocess.run(
+            [sys.executable, "-m", "virtualenv", abs_env_dir],
+            env=env, capture_output=True, text=True,
+            creationflags=CREATE_NO_WINDOW,
         )
+        if r.returncode != 0:
+            raise RuntimeError(
+                f"虚拟环境创建失败 (exit {r.returncode}):\n"
+                f"{(r.stderr or r.stdout).strip() or '(no output)'}"
+            )
 
-        full_cmd = f'cmd /s /c "{combined_payload}"'
-        res = subprocess.run(full_cmd, creationflags=0x00000010 if show_console else 0, check=False)
+        # 把"看不见的 SEH 崩溃"变成"看得见的退出码", 让用户能据此自查或截屏反馈。
+        r = subprocess.run(
+            [venv_python, "-c", "import sys; print(sys.version)"],
+            env=env, capture_output=True, text=True, timeout=15,
+        )
+        if r.returncode != 0:
+            code_hex = f"0x{r.returncode & 0xFFFFFFFF:08X}"
+            hints = {
+                "0xC0000142": "进程初始化失败。常见原因: 安装路径在网络盘 / 外置盘 / OneDrive 同步盘, 或被企业 EDR 拦截。",
+                "0xC0000135": "缺少必要 DLL。请检查 VC++ 运行库或安全软件是否隔离了 python.exe 的依赖。",
+                "0xC0000005": "访问违例。常见于安全软件 (Defender ASR / 360 / 火绒) 拦截了进程启动。",
+                "0xC000007B": "DLL 位数错配。系统 PATH 上可能存在与 AScript 自带 Python 冲突的同名 DLL。",
+            }
+            hint = hints.get(code_hex, "请把以上完整信息发给开发者排查。")
+            raise RuntimeError(
+                f"虚拟环境自检失败 (exit {code_hex}):\n"
+                f"  路径: {venv_python}\n"
+                f"  stdout: {r.stdout.strip() or '(empty)'}\n"
+                f"  stderr: {r.stderr.strip() or '(empty)'}\n"
+                f"  提示: {hint}"
+            )
 
-        if res.returncode != 0:
-            raise RuntimeError("Installation command failed.")
+        index_url = self._get_best_index()
+        print(f"[{user_id}] 自动择源完成，选用: {index_url}")
+        timeout = getattr(self, 'config', {}).get('timeout', 15)
+        pip_args = [
+            pip_path, "install", "--no-cache-dir",
+            "-i", index_url,
+            "--default-timeout", str(timeout),
+            abs_wheel_path,
+        ]
+
+        if show_console:
+            # 大 wheel (torch / opencv) 装起来要几分钟, 开个控制台让用户看进度.
+            cmd_payload = (
+                f'title 正在安装插件依赖 - {user_id} && '
+                + subprocess.list2cmdline(pip_args)
+                + ' || (echo. && echo ------------------------------------------------ && '
+                  'echo [错误] 插件依赖安装失败！请查看上方红字报错原因。 && '
+                  'echo 解决后关闭此窗口，重新启动程序即可。 && '
+                  'echo ------------------------------------------------ && pause && exit 1)'
+            )
+            r = subprocess.run(
+                f'cmd /s /c "{cmd_payload}"',
+                env=env, creationflags=CREATE_NEW_CONSOLE, check=False,
+            )
+            if r.returncode != 0:
+                raise RuntimeError("插件依赖安装失败 (详见控制台窗口的红字提示)。")
+        else:
+            r = subprocess.run(
+                pip_args, env=env, capture_output=True, text=True,
+                creationflags=CREATE_NO_WINDOW,
+            )
+            if r.returncode != 0:
+                tail = "\n".join((r.stderr or r.stdout or "").splitlines()[-15:]) or "(no output)"
+                raise RuntimeError(f"插件依赖安装失败 (exit {r.returncode}):\n{tail}")
 
     def run_app(self, user_id, entry_module="main", cwd=None, show_console=False):
         """启动用户应用程序。
@@ -298,7 +368,7 @@ class EnvManager:
         pid_file = os.path.join(env_dir, "app.pid")
 
         try:
-            flags = 0 if show_console else 0x08000000
+            flags = 0 if show_console else CREATE_NO_WINDOW
             with open(last_error_log, "w", encoding="utf-8") as f_err:
                 process = subprocess.Popen(
                     cmd,
@@ -307,7 +377,8 @@ class EnvManager:
                     stdout=subprocess.DEVNULL,
                     stderr=f_err,
                     text=True,
-                    encoding='utf-8'
+                    encoding='utf-8',
+                    env=_clean_env(),
                 )
 
             with open(pid_file, "w") as f:
@@ -429,7 +500,7 @@ class EnvManager:
                 except:
                     pass
             if psutil.pid_exists(pid):
-                subprocess.run(["taskkill", "/F", "/T", "/PID", str(pid)], creationflags=0x08000000,
+                subprocess.run(["taskkill", "/F", "/T", "/PID", str(pid)], creationflags=CREATE_NO_WINDOW,
                                capture_output=True)
         except:
             pass

{ascript-1.3.1 → ascript-1.3.3}/ascript/windows/tools/web/app_store_window.html

@@ -451,7 +451,12 @@
         refreshHistory();
     }
 
-    window.addEventListener('onPythonReady', init);
+    // 同时兼容两种时序：注入早于本脚本时直接执行，否则等待事件
+    if (window.callPython) {
+        init();
+    } else {
+        window.addEventListener('onPythonReady', init);
+    }
 </script>
 </body>
 </html>

{ascript-1.3.1 → ascript-1.3.3}/ascript/windows/ui/web_window.py

@@ -92,7 +92,7 @@ class WebWindow:
         )
 
         # 动态注入 callPython 桥接，HTML 文件无需修改
-        def on_loaded():
+        def on_loaded(*args):
             injection_code = """
             window.callPython = async function(fnName, ...args) {
                 return await window.pywebview.api.call_internal(fnName, args);
@@ -101,12 +101,17 @@ class WebWindow:
             """
             self.webview_instance.evaluate_js(injection_code)
 
+        # 绑定到页面真正的 loaded 事件，确保 HTML 内的 <script>
+        # （含 onPythonReady 监听器）已执行完毕后再注入并派发事件，
+        # 否则慢机器上会出现“事件先于监听器”导致永久卡在加载页。
+        self.webview_instance.events.loaded += on_loaded
+
         if block:
-            webview.start(on_loaded, debug=debug)
+            webview.start(debug=debug)
             return self._return_value
         else:
             def _run():
-                webview.start(on_loaded, debug=debug)
+                webview.start(debug=debug)
 
             t = threading.Thread(target=_run, daemon=True)
             t.start()

{ascript-1.3.1 → ascript-1.3.3}/ascript.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ascript
-Version: 1.3.1
+Version: 1.3.3
 Summary: Ascript Developer Library
 License: MIT
 Classifier: Operating System :: Microsoft :: Windows

{ascript-1.3.1 → ascript-1.3.3}/ascript.egg-info/SOURCES.txt

@@ -7,71 +7,8 @@ ascript.egg-info/SOURCES.txt
 ascript.egg-info/dependency_links.txt
 ascript.egg-info/requires.txt
 ascript.egg-info/top_level.txt
-ascript/android/__init__.py
-ascript/android/cloud_control.py
-ascript/android/data.py
-ascript/android/media.py
-ascript/android/node.py
-ascript/android/plug.py
-ascript/android/ui.py
-ascript/android/action/__init__.py
-ascript/android/action/ashid.py
-ascript/android/screen/__init__.py
-ascript/android/screen/ascv.py
-ascript/android/screen/color_tools.py
-ascript/android/screen/gp.py
-ascript/android/screen/gp_tasks.py
-ascript/android/screen/gp_tool.py
-ascript/android/shizuku/__init__.py
-ascript/android/system/__init__.py
 ascript/hooks/__init__.py
 ascript/hooks/hook-ascript.py
-ascript/ios/__init__.py
-ascript/ios/ime.py
-ascript/ios/media.py
-ascript/ios/node.py
-ascript/ios/ui.py
-ascript/ios/action/__init__.py
-ascript/ios/developer/__init__.py
-ascript/ios/developer/ws.py
-ascript/ios/developer/api/__init__.py
-ascript/ios/developer/api/api_2_android.py
-ascript/ios/developer/api/api_code.py
-ascript/ios/developer/api/api_file.py
-ascript/ios/developer/api/api_label.py
-ascript/ios/developer/api/api_module.py
-ascript/ios/developer/api/api_node.py
-ascript/ios/developer/api/api_screen.py
-ascript/ios/developer/api/api_tool.py
-ascript/ios/developer/api/dao.py
-ascript/ios/developer/api/data.py
-ascript/ios/developer/api/file_utils.py
-ascript/ios/developer/api/label_utils.py
-ascript/ios/developer/api/line_helper.py
-ascript/ios/developer/api/oc.py
-ascript/ios/developer/api/oc_gp.py
-ascript/ios/developer/api/sp_utils.py
-ascript/ios/developer/api/utils.py
-ascript/ios/developer/api/wda_gp.py
-ascript/ios/screen/__init__.py
-ascript/ios/screen/ascv.py
-ascript/ios/screen/color_tools.py
-ascript/ios/screen/dao.py
-ascript/ios/screen/gp.py
-ascript/ios/screen/yolov8.py
-ascript/ios/system/__init__.py
-ascript/ios/system/device.py
-ascript/ios/wdapy/__init__.py
-ascript/ios/wdapy/_alert.py
-ascript/ios/wdapy/_base.py
-ascript/ios/wdapy/_node.py
-ascript/ios/wdapy/_proto.py
-ascript/ios/wdapy/_types.py
-ascript/ios/wdapy/_utils.py
-ascript/ios/wdapy/_wdapy.py
-ascript/ios/wdapy/_wrap.py
-ascript/ios/wdapy/exceptions.py
-ascript/ios/wdapy/xcui_element_types.py
 ascript/windows/__init__.py
 ascript/windows/daos/__init__.py
 ascript/windows/daos/screen.py
@@ -267,10 +204,4 @@ ascript/windows/utils/screen_utils.py
 ascript/windows/window/Selector.py
 ascript/windows/window/Window.py
 ascript/windows/window/__init__.py
-ascript/windows/window/launcher.py
-docs/source/build_index.py
-docs/source/conf.py
-docs/source/doc_extractor.py
-docs/source/generate_api_data.py
-docs/source/_build/_sources/autoapi/ascript/windows/client/tools/index.rst.txt
-docs/source/_build/autoapi/ascript/windows/client/tools/index.html
+ascript/windows/window/launcher.py

{ascript-1.3.1 → ascript-1.3.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ascript"
-version = "1.3.1"
+version = "1.3.3"
 description = "Ascript Developer Library"
 readme = "README.md"
 requires-python = ">=3.9"

ascript-1.3.1/ascript/android/__init__.py

@@ -1,11 +0,0 @@
-from . import action
-from . import data
-from . import media
-from . import node
-from . import screen
-from . import system
-from . import sms
-from . import ui
-from . import plug
-from . import shizuku
-from . import cloud_control