ascript 1.3.3__tar.gz → 1.3.4__tar.gz

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

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

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

@@ -7,7 +7,8 @@ import ctypes
 import psutil
 import time
 from pkginfo import Wheel  # 确保主环境已安装 pkginfo
-import urllib
+
+from .pip import Pip
 
 
 CREATE_NEW_CONSOLE = 0x00000010
@@ -214,35 +215,6 @@ class EnvManager:
                 shutil.rmtree(env_dir, ignore_errors=True)
             return False
 
-    def _get_best_index(self):
-        """测速选择最快的 PyPI 镜像源。
-
-        对比官方源和清华源的响应时间，返回延迟最低的源地址。
-
-        Returns:
-            str: 最快的 PyPI 镜像源 URL。
-        """
-        sources = {
-            "tsinghua": "https://pypi.tuna.tsinghua.edu.cn/simple",
-            "pypi": "https://pypi.org/simple"
-        }
-        best_url = sources["pypi"]  # 默认官方兜底
-        min_time = 999.0
-
-        for name, url in sources.items():
-            try:
-                start = time.time()
-                # timeout 设短一点，1秒内没反应就说明该源当前不佳
-                with urllib.request.urlopen(url, timeout=1.0) as res:
-                    if res.getcode() == 200:
-                        duration = time.time() - start
-                        if duration < min_time:
-                            min_time = duration
-                            best_url = url
-            except:
-                continue
-        return best_url
-
     def _execute_combined_install(self, user_id, wheel_path, env_dir, show_console):
         """分三步部署: 创建 venv → 自检 venv python.exe → pip 安装 wheel。
 
@@ -292,7 +264,7 @@ class EnvManager:
                 f"  提示: {hint}"
             )
 
-        index_url = self._get_best_index()
+        index_url = Pip.get_best_index()
         print(f"[{user_id}] 自动择源完成，选用: {index_url}")
         timeout = getattr(self, 'config', {}).get('timeout', 15)
         pip_args = [

ascript-1.3.4/ascript/windows/system/pip.py

@@ -0,0 +1,175 @@
+import subprocess
+import sys
+import re
+import time
+import threading
+import urllib.request
+from importlib.metadata import version, PackageNotFoundError
+
+
+class Pip:
+    """
+    Python 包管理工具类，具备自动择源功能。
+    """
+    # 备选镜像源列表
+    MIRRORS = {
+        "tsinghua": "https://pypi.tuna.tsinghua.edu.cn/simple",
+        "aliyun": "https://mirrors.aliyun.com/pypi/simple/",
+        "ustc": "https://pypi.mirrors.ustc.edu.cn/simple/",
+        "pypi": "https://pypi.org/simple",
+    }
+    # 兜底源：所有探测都失败时使用，绝不拿慢的官方源兜底
+    _FALLBACK_INDEX = "https://pypi.tuna.tsinghua.edu.cn/simple"
+
+    # 吞吐探测参数：单源最多下 1.5 秒 或 3MB 即停；连接超时 2 秒
+    _PROBE_TIME_BUDGET = 1.5
+    _PROBE_SIZE_CAP = 3 * 1024 * 1024
+    _PROBE_CONNECT_TIMEOUT = 2.0
+
+    # 进程内缓存：择源结果复用，避免每装一个包都重新测速
+    _cached_index = None
+    _cache_lock = threading.Lock()
+
+    @staticmethod
+    def _probe_throughput(url: str) -> float:
+        """限量下载该镜像的 simple 索引，返回实测吞吐量（字节/秒）。失败返回 0。
+
+        测的是真实下载速度而非连接延迟 —— 镜像源常见"连得上但限速"，
+        延迟低不代表下得快。
+        """
+        try:
+            req = urllib.request.Request(url, headers={"User-Agent": "ascript-pip-probe"})
+            start = time.time()
+            downloaded = 0
+            with urllib.request.urlopen(req, timeout=Pip._PROBE_CONNECT_TIMEOUT) as resp:
+                if resp.getcode() != 200:
+                    return 0.0
+                while True:
+                    chunk = resp.read(64 * 1024)
+                    if not chunk:
+                        break
+                    downloaded += len(chunk)
+                    if (time.time() - start) >= Pip._PROBE_TIME_BUDGET \
+                            or downloaded >= Pip._PROBE_SIZE_CAP:
+                        break
+            elapsed = time.time() - start
+            if elapsed <= 0 or downloaded == 0:
+                return 0.0
+            return downloaded / elapsed
+        except Exception:
+            return 0.0
+
+    @staticmethod
+    def get_best_index() -> str:
+        """并行测各镜像的实测下载吞吐量，返回最快的源。结果进程内缓存。"""
+        if Pip._cached_index:
+            return Pip._cached_index
+
+        with Pip._cache_lock:
+            if Pip._cached_index:  # 双重检查，避免并发安装时重复测速
+                return Pip._cached_index
+
+            # 预填所有键：worker 只更新值、不新增键，这样万一 join 超时后掉队
+            # 线程仍在写，下面 max() 遍历也不会撞上"字典大小被改"。
+            results = {name: 0.0 for name in Pip.MIRRORS}
+
+            def worker(name, url):
+                results[name] = Pip._probe_throughput(url)
+
+            threads = [
+                threading.Thread(target=worker, args=(n, u), daemon=True)
+                for n, u in Pip.MIRRORS.items()
+            ]
+            for t in threads:
+                t.start()
+            # join 超时仅作兜底（探测线程内部已有超时，正常 3.5s 内结束）；
+            # 必须长于单次探测最坏耗时 = 连接超时 + 下载预算。
+            for t in threads:
+                t.join(timeout=Pip._PROBE_CONNECT_TIMEOUT + Pip._PROBE_TIME_BUDGET + 1.0)
+
+            best = max(results, key=results.get)
+            Pip._cached_index = Pip.MIRRORS[best] if results[best] > 0 \
+                else Pip._FALLBACK_INDEX
+            return Pip._cached_index
+
+    @staticmethod
+    def is_installed(package_spec: str) -> bool:
+        """检查指定包是否已安装。
+
+        Args:
+            package_spec: 包名或带版本约束的包规范，如 "requests" 或 "requests>=2.28"。
+
+        Returns:
+            bool: 已安装返回 True，未安装返回 False。
+        """
+        package_name = re.split(r'[<>=!]', package_spec)[0].strip()
+        try:
+            version(package_name)
+            return True
+        except PackageNotFoundError:
+            return False
+
+    @staticmethod
+    def install(package_spec: str, upgrade: bool = False, index_url: str = None) -> bool:
+        """安装 Python 包。
+
+        如果未指定 index_url，则自动测速选择最快的镜像源进行安装。
+
+        Args:
+            package_spec: 包名或带版本约束的包规范，如 "requests>=2.28"。
+            upgrade: 是否升级到最新版本，默认 False。
+            index_url: 指定的 PyPI 镜像源 URL，默认 None（自动择源）。
+
+        Returns:
+            bool: 安装成功返回 True，失败返回 False。
+        """
+        # 自动择源逻辑
+        target_index = index_url if index_url else Pip.get_best_index()
+
+        command = [sys.executable, "-m", "pip", "install", package_spec]
+
+        if target_index:
+            command.extend(["-i", target_index])
+            if target_index.startswith("http://"):
+                host = target_index.split("/")[2].split(":")[0]
+                command.extend(["--trusted-host", host])
+
+        if upgrade:
+            command.append("--upgrade")
+
+        try:
+            subprocess.check_call(command)
+            return True
+        except subprocess.CalledProcessError:
+            return False
+
+    @staticmethod
+    def ensure(package_spec: str, index_url: str = None) -> bool:
+        """确保指定包已安装，未安装则自动安装。
+
+        Args:
+            package_spec: 包名或带版本约束的包规范。
+            index_url: 指定的 PyPI 镜像源 URL，默认 None（自动择源）。
+
+        Returns:
+            bool: 包已存在或安装成功返回 True，安装失败返回 False。
+        """
+        if Pip.is_installed(package_spec):
+            return True
+        return Pip.install(package_spec, index_url=index_url)
+
+    @staticmethod
+    def remove(package_name: str) -> bool:
+        """卸载指定的 Python 包。
+
+        Args:
+            package_name: 要卸载的包名。
+
+        Returns:
+            bool: 卸载成功返回 True，失败返回 False。
+        """
+        try:
+            subprocess.check_call([sys.executable, "-m", "pip", "uninstall", package_name, "-y"])
+            return True
+        except subprocess.CalledProcessError:
+            return False

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

@@ -192,6 +192,14 @@
     let isDeploying = false;
     let lastKnownRunning = false;
 
+    // 诊断：直连 pywebview 桥接写日志，不走 callPython（callPython 本身可能是故障点）
+    function _jslog(m) {
+        try { window.pywebview.api.call_internal('_diag', ['JS: ' + m]); } catch (e) {}
+    }
+    let _initStarted = false;
+    _jslog('inline script started, callPython=' + (typeof window.callPython)
+           + ', pywebview=' + (typeof window.pywebview));
+
     window.updateDownloadProgress = function(percent) {
         const progressBg = document.getElementById('btn-progress');
         const btnText = document.getElementById('btn-text');
@@ -331,9 +339,15 @@
 
     // 其余函数 (init, goBack, renderDetailPage等) 全部保持不变...
     async function init() {
+        if (_initStarted) { _jslog('init() re-entry blocked'); return; }
+        _initStarted = true;
+        _jslog('init() START');
         try {
+            _jslog('init: before refreshHistory');
             await refreshHistory();
+            _jslog('init: before get_init_config');
             const config = await window.callPython("get_init_config");
+            _jslog('init: get_init_config -> ' + JSON.stringify(config));
             if (config && config.default_id) {
                 isSingleAppMode = true;
                 await handleSearch(config.default_id);
@@ -342,7 +356,8 @@
                 document.getElementById('home-page').style.display = 'flex';
                 requestAnimationFrame(() => { setTimeout(hideLoader, 50); });
             }
-        } catch (e) { hideLoader(); }
+            _jslog('init() DONE');
+        } catch (e) { _jslog('init() CATCH: ' + e); hideLoader(); }
     }
 
     async function refreshHistory() {
@@ -396,6 +411,7 @@
     }
 
     function hideLoader() {
+        _jslog('hideLoader called');
         const loader = document.getElementById('init-loader');
         if (loader.style.display === 'none') return;
         loader.style.opacity = '0';
@@ -452,9 +468,12 @@
     }
 
     // 同时兼容两种时序：注入早于本脚本时直接执行，否则等待事件
+    _jslog('script bottom, callPython=' + (typeof window.callPython));
     if (window.callPython) {
+        _jslog('taking direct init() path');
         init();
     } else {
+        _jslog('registering onPythonReady listener');
         window.addEventListener('onPythonReady', init);
     }
 </script>

ascript-1.3.4/ascript/windows/ui/web_window.py

@@ -0,0 +1,268 @@
+import threading
+import subprocess
+import tempfile
+import ctypes
+import webbrowser
+import datetime
+from pathlib import Path
+
+import webview
+import os
+from typing import Optional, Callable, Dict
+
+# WebView2 运行时：官方下载页 + 常青版引导安装器（约 2MB，联网拉取完整运行时）
+_WEBVIEW2_DOWNLOAD_URL = "https://developer.microsoft.com/microsoft-edge/webview2/"
+_WEBVIEW2_BOOTSTRAPPER_URL = "https://go.microsoft.com/fwlink/p/?LinkId=2124703"
+
+# 诊断日志：定位握手故障点，写到用户主目录
+_DIAG_LOG = os.path.join(os.path.expanduser("~"), "ascript_diag.log")
+
+
+def _diag(msg, reset=False):
+    """把诊断信息写入 ~/ascript_diag.log。reset=True 时清空重写。"""
+    try:
+        mode = "w" if reset else "a"
+        ts = datetime.datetime.now().strftime("%H:%M:%S.%f")[:-3]
+        with open(_DIAG_LOG, mode, encoding="utf-8") as f:
+            f.write(f"[{ts}] {msg}\n")
+    except Exception:
+        pass
+
+
+# Win32 MessageBox 标志位与返回值
+_MB_YESNO = 0x04
+_MB_ICONERROR = 0x10
+_MB_ICONWARNING = 0x30
+_MB_ICONINFORMATION = 0x40
+_IDYES = 6
+
+
+def _msgbox(text: str, title: str = "AScript", style: int = _MB_ICONERROR) -> int:
+    """弹出 Windows 原生消息框。"""
+    return ctypes.windll.user32.MessageBoxW(0, text, title, style)
+
+
+def _install_webview2() -> bool:
+    """下载并静默安装 WebView2 Runtime。成功返回 True。"""
+    try:
+        import requests
+        bootstrapper = os.path.join(tempfile.gettempdir(), "MicrosoftEdgeWebview2Setup.exe")
+        _diag("downloading WebView2 bootstrapper")
+        with requests.get(_WEBVIEW2_BOOTSTRAPPER_URL, stream=True, timeout=120) as resp:
+            resp.raise_for_status()
+            with open(bootstrapper, "wb") as f:
+                for chunk in resp.iter_content(chunk_size=1024 * 64):
+                    f.write(chunk)
+        _diag("running WebView2 bootstrapper /silent /install")
+        result = subprocess.run([bootstrapper, "/silent", "/install"], timeout=600)
+        _diag(f"WebView2 installer returncode={result.returncode}")
+        return result.returncode == 0
+    except Exception as e:
+        _diag(f"WebView2 install failed: {e!r}")
+        return False
+
+
+def _install_webview2_with_ui() -> bool:
+    """带进度窗口地安装 WebView2。MS 静默安装器不汇报百分比，
+    故用滚动式（不确定模式）进度条表示"正在进行"。tkinter 不可用时退化为无窗口安装。"""
+    state = {"ok": False, "done": False}
+
+    def worker():
+        state["ok"] = _install_webview2()
+        state["done"] = True
+
+    t = threading.Thread(target=worker, daemon=True)
+    t.start()
+
+    try:
+        import tkinter as tk
+        from tkinter import ttk
+
+        root = tk.Tk()
+        root.title("AScript - 安装运行环境")
+        root.resizable(False, False)
+        w, h = 400, 140
+        sw, sh = root.winfo_screenwidth(), root.winfo_screenheight()
+        root.geometry(f"{w}x{h}+{(sw - w) // 2}+{(sh - h) // 2}")
+        root.attributes("-topmost", True)
+        root.protocol("WM_DELETE_WINDOW", lambda: None)  # 安装中禁止关闭
+
+        tk.Label(root, text="正在下载并安装 Microsoft Edge WebView2 运行时").pack(pady=(26, 4))
+        tk.Label(root, text="约需 1-2 分钟，请勿关闭此窗口...", fg="#666").pack()
+        bar = ttk.Progressbar(root, mode="indeterminate", length=340)
+        bar.pack(pady=18)
+        bar.start(15)
+
+        def poll():
+            if state["done"]:
+                bar.stop()
+                root.destroy()
+            else:
+                root.after(200, poll)
+
+        root.after(200, poll)
+        root.mainloop()
+    except Exception as e:
+        _diag(f"progress UI unavailable, installing without it: {e!r}")
+        t.join()  # 没有 UI 也要等安装完成
+
+    return state["ok"]
+
+
+# 注入到页面的桥接代码：定义 callPython 并派发 onPythonReady。
+# 故意使用现代语法（async / ...rest）—— 既是功能需要，也是引擎能力探针：
+# 真正的 WebView2/Chromium 能解析，IE/MSHTML 会抛 SyntaxError。
+# IIFE + callPython 存在性判断 → 多次注入也幂等。
+_INJECTION_CODE = """
+(function () {
+    if (window.callPython) { return; }
+    window.callPython = async function (fnName, ...args) {
+        return await window.pywebview.api.call_internal(fnName, args);
+    };
+    try { window.pywebview.api.call_internal('_diag', ['JS: callPython injected']); } catch (e) {}
+    window.dispatchEvent(new CustomEvent('onPythonReady'));
+})();
+"""
+
+
+class WebWindow:
+    """基于 pywebview 的 Web 窗口基类。"""
+
+    def __init__(self, html_path: str, project_root: Optional[str] = None):
+        self.project_root = os.path.abspath(project_root) if project_root else os.getcwd()
+        self.abs_path = os.path.abspath(html_path)
+        self._exposed_functions: Dict[str, Callable] = {}
+        self.webview_instance = None
+        self._return_value = None
+        self._injected = False
+        self._engine_error_handled = False
+
+    def expose(self, func: Callable):
+        """将 Python 函数暴露给前端 JavaScript 调用。"""
+        self._exposed_functions[func.__name__] = func
+        return func
+
+    def _inject(self, source: str):
+        """注入 callPython 桥接并派发 onPythonReady。可被多个时机触发，幂等。"""
+        if self._injected or self._engine_error_handled:
+            return
+        _diag(f"_inject START, source={source}")
+        try:
+            self.webview_instance.evaluate_js(_INJECTION_CODE)
+            self._injected = True
+            _diag(f"_inject DONE, source={source}")
+        except Exception as e:
+            _diag(f"_inject ERROR, source={source}: {e!r}")
+            # SyntaxError 是确凿信号：现代引擎绝不会对合法的现代 JS 报 SyntaxError，
+            # 只有 IE/MSHTML 才会 → 据此判定引擎不可用。不查注册表，不会误判。
+            # 其它异常（多为时机问题）只记录，留给另一个注入时机重试。
+            if "SyntaxError" in str(e):
+                self._handle_engine_error()
+
+    def _handle_engine_error(self):
+        """检测到当前是 IE/MSHTML 引擎（WebView2 不可用）。
+        现代 JS 在此引擎下无法运行，关闭卡死的窗口并引导用户安装 WebView2。"""
+        if self._engine_error_handled:
+            return
+        self._engine_error_handled = True
+        _diag("ENGINE ERROR: modern JS rejected -> WebView2 not in use (MSHTML fallback)")
+        # 先隐藏卡死的窗口，但不要 destroy —— destroy 会让 webview.start 返回、
+        # 主线程退出，把后面的安装进度窗口一起带走。等安装流程走完再关。
+        try:
+            self.webview_instance.hide()
+        except Exception:
+            pass
+        choice = _msgbox(
+            "AScript 无法启动：界面引擎回退到了过时的 IE 内核，\n"
+            "通常是缺少 Microsoft Edge WebView2 运行时。\n\n"
+            "是否现在自动下载并安装？（约 1-2 分钟，需联网）",
+            "缺少运行环境", _MB_YESNO | _MB_ICONWARNING)
+        if choice == _IDYES:
+            if _install_webview2_with_ui():
+                _msgbox("WebView2 安装完成，请重新启动 AScript。", "AScript", _MB_ICONINFORMATION)
+            else:
+                _msgbox("自动安装失败，即将打开下载页面，请手动安装后重新启动程序。")
+                webbrowser.open(_WEBVIEW2_DOWNLOAD_URL)
+        else:
+            _msgbox("已取消。请手动安装 WebView2 运行时后重新启动程序：\n" + _WEBVIEW2_DOWNLOAD_URL)
+        # 全部处理完，关闭窗口让 webview.start 返回、进程干净退出
+        try:
+            self.webview_instance.destroy()
+        except Exception:
+            pass
+
+    def show(self, title: str = "AScript Window", debug=False, block: bool = True, **kwargs):
+        """创建并显示 Web 窗口。"""
+        _diag(f"show() called, html={self.abs_path}, block={block}", reset=True)
+
+        class ApiBridge:
+            """JavaScript 与 Python 之间的 API 桥接。"""
+
+            def __init__(self, funcs):
+                self._funcs = funcs
+
+            def call_internal(self, func_name, args):
+                _diag(f"call_internal ENTER: {func_name} args={args!r}")
+                f = self._funcs.get(func_name)
+                if not f:
+                    _diag(f"call_internal: '{func_name}' NOT FOUND")
+                    return None
+                try:
+                    result = f(*args)
+                    _diag(f"call_internal EXIT: {func_name} -> {repr(result)[:200]}")
+                    return result
+                except Exception as e:
+                    _diag(f"call_internal ERROR: {func_name}: {e!r}")
+                    print(f"Error calling {func_name}: {e}")
+                    return None
+
+        # 诊断用：让 JS 也能往同一份日志里写
+        self._exposed_functions.setdefault("_diag", lambda m: _diag(str(m)))
+
+        file_url = Path(self.abs_path).as_uri()
+        self.webview_instance = webview.create_window(
+            title=title,
+            url=file_url,
+            js_api=ApiBridge(self._exposed_functions),
+            **kwargs
+        )
+        _diag("window created")
+
+        def on_loaded(*args):
+            _diag(f"events.loaded fired, args={args!r}")
+            self._inject("events.loaded")
+
+        def on_start():
+            # webview.start 的启动钩子，作为 events.loaded 的兜底注入时机
+            _diag("webview.start hook fired")
+            self._inject("start-hook")
+
+        self.webview_instance.events.loaded += on_loaded
+        _diag("events.loaded subscribed")
+
+        # 强制 edgechromium：装了 WebView2 时确保用它。
+        # 但 pywebview 在 WebView2 缺失时会"静默回退"到 MSHTML 且不抛异常，
+        # 所以真正的判定靠 _inject 里对真实引擎的运行时探测，而非这里。
+        if block:
+            try:
+                _diag("calling webview.start (block) gui=edgechromium")
+                webview.start(on_start, debug=debug, gui='edgechromium')
+                _diag("webview.start returned")
+            except Exception as e:
+                _diag(f"webview.start raised: {e!r}")
+            return self._return_value
+        else:
+            def _run():
+                try:
+                    _diag("calling webview.start (thread) gui=edgechromium")
+                    webview.start(on_start, debug=debug, gui='edgechromium')
+                except Exception as e:
+                    _diag(f"webview.start raised (thread): {e!r}")
+
+            t = threading.Thread(target=_run, daemon=True)
+            t.start()
+
+    def close(self):
+        """关闭并销毁 Web 窗口。"""
+        if self.webview_instance:
+            self.webview_instance.destroy()

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

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

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

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