jadeui 2.3.2__tar.gz → 2.3.3__tar.gz

{jadeui-2.3.2 → jadeui-2.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jadeui
-Version: 2.3.2
+Version: 2.3.3
 Summary: Python SDK for JadeView - Create desktop applications with WebView
 Project-URL: Homepage, https://jade.run
 Project-URL: Documentation, https://jade.run/python-sdk
@@ -211,15 +211,11 @@ Window(title="My App").run(japk="dist/app.japk")
 
 ## 打包发布（宿主 exe）
 
-默认使用 **Nuitka** 将 Python 宿主打包为独立可执行文件；也可用 PyInstaller：
+默认使用 **Nuitka** 将 Python 宿主打包为独立可执行文件；也可用 PyInstaller。  
+缺少打包器时会**自动安装**（`nuitka>=4.0` 或 PyInstaller，可用 `--no-auto-deps` 关闭）：
 
 ```bash
-# Nuitka（推荐；onefile 建议使用 4.0rc7）
-# pip install https://github.com/HG-ha/jadeui/raw/main/scripts/nuitka-4.0.rc7.zip
 jadeui build app.py -o your_app
-
-# 可选 PyInstaller
-pip install jadeui[pyinstaller]
 jadeui build app.py -o your_app --packager pyinstaller
 ```
 

{jadeui-2.3.2 → jadeui-2.3.3}/README.md

@@ -174,15 +174,11 @@ Window(title="My App").run(japk="dist/app.japk")
 
 ## 打包发布（宿主 exe）
 
-默认使用 **Nuitka** 将 Python 宿主打包为独立可执行文件；也可用 PyInstaller：
+默认使用 **Nuitka** 将 Python 宿主打包为独立可执行文件；也可用 PyInstaller。  
+缺少打包器时会**自动安装**（`nuitka>=4.0` 或 PyInstaller，可用 `--no-auto-deps` 关闭）：
 
 ```bash
-# Nuitka（推荐；onefile 建议使用 4.0rc7）
-# pip install https://github.com/HG-ha/jadeui/raw/main/scripts/nuitka-4.0.rc7.zip
 jadeui build app.py -o your_app
-
-# 可选 PyInstaller
-pip install jadeui[pyinstaller]
 jadeui build app.py -o your_app --packager pyinstaller
 ```
 

{jadeui-2.3.2 → jadeui-2.3.3}/jadeui/__init__.py

@@ -78,7 +78,7 @@ from .system import CLEAR_DATA_CONFIRM_TOKEN, System
 from .tray import Tray
 from .window import Backdrop, Theme, Window
 
-__version__ = "2.3.2"
+__version__ = "2.3.3"
 __author__ = "JadeView Team"
 __license__ = "MIT"
 

{jadeui-2.3.2 → jadeui-2.3.3}/jadeui/app.py

@@ -606,9 +606,7 @@ class JadeUIApp(EventEmitter):
         self.on("window-all-closed", callback)
         return callback
 
-    def on_second_instance(
-        self, callback: Callable[[Any], Any]
-    ) -> Callable[[Any], Any]:
+    def on_second_instance(self, callback: Callable[[Any], Any]) -> Callable[[Any], Any]:
         """Decorator for second-instance event (requires ``single_instance=True``).
 
         Args:

{jadeui-2.3.2 → jadeui-2.3.3}/jadeui/cli/build.py

@@ -9,9 +9,30 @@ import sys
 from pathlib import Path
 from typing import List, Optional, Tuple
 
-NUITKA_INSTALL_CMD = (
-    "pip install https://github.com/HG-ha/jadeui/raw/main/scripts/nuitka-4.0.rc7.zip"
-)
+# Nuitka 4.0+ 已在正式版修复 onefile 缺 VCRUNTIME140 的问题（#3706）
+NUITKA_PIP_SPEC = "nuitka>=4.0"
+NUITKA_INSTALL_CMD = f'pip install "{NUITKA_PIP_SPEC}"'
+PYINSTALLER_INSTALL_CMD = "pip install pyinstaller"
+
+
+def _nuitka_major(version_line: Optional[str]) -> Optional[int]:
+    """Parse major version from ``nuitka --version`` first line (e.g. ``4.1.3``)."""
+    if not version_line:
+        return None
+    token = version_line.strip().split()[0]
+    # Accept 4.1.3 / 4.0rc7 / 4.0.0.post1
+    major = ""
+    for ch in token:
+        if ch.isdigit():
+            major += ch
+        elif ch == "." and major:
+            break
+        else:
+            break
+    try:
+        return int(major) if major else None
+    except ValueError:
+        return None
 
 
 def check_nuitka() -> Tuple[bool, Optional[str]]:
@@ -43,6 +64,63 @@ def check_pyinstaller() -> Tuple[bool, Optional[str]]:
         return False, None
 
 
+def _pip_install(*packages: str) -> bool:
+    cmd = [sys.executable, "-m", "pip", "install", *packages]
+    print("执行:", " ".join(cmd))
+    code = subprocess.call(cmd)
+    return code == 0
+
+
+def ensure_nuitka(*, auto_install: bool = True) -> Tuple[bool, Optional[str]]:
+    """Ensure Nuitka >= 4.0 is available; auto-install from PyPI when missing."""
+    ok, ver = check_nuitka()
+    if ok:
+        return True, ver
+    if not auto_install:
+        print("错误: 未安装 Nuitka")
+        print(f"  安装: {NUITKA_INSTALL_CMD}")
+        return False, None
+
+    print(f"未检测到 Nuitka，正在自动安装 {NUITKA_PIP_SPEC} …")
+    print("（Nuitka 4.0+ 已修复 onefile 在纯净 Windows 上缺 VC++ 运行时的问题）")
+    if not _pip_install(NUITKA_PIP_SPEC):
+        print("错误: Nuitka 自动安装失败")
+        print(f"  请手动执行: {NUITKA_INSTALL_CMD}")
+        return False, None
+
+    ok, ver = check_nuitka()
+    if not ok:
+        print("错误: Nuitka 安装后仍不可用，请检查当前 Python 环境")
+        return False, None
+    print(f"已安装 Nuitka: {ver}")
+    return True, ver
+
+
+def ensure_pyinstaller(*, auto_install: bool = True) -> Tuple[bool, Optional[str]]:
+    """Ensure PyInstaller is available; auto-install when missing."""
+    ok, ver = check_pyinstaller()
+    if ok:
+        return True, ver
+    if not auto_install:
+        print("错误: 未安装 PyInstaller")
+        print(f"  安装: {PYINSTALLER_INSTALL_CMD}")
+        print("  # 或: pip install jadeui[pyinstaller]")
+        return False, None
+
+    print("未检测到 PyInstaller，正在自动安装 …")
+    if not _pip_install("pyinstaller"):
+        print("错误: PyInstaller 自动安装失败")
+        print(f"  请手动执行: {PYINSTALLER_INSTALL_CMD}")
+        return False, None
+
+    ok, ver = check_pyinstaller()
+    if not ok:
+        print("错误: PyInstaller 安装后仍不可用，请检查当前 Python 环境")
+        return False, None
+    print(f"已安装 PyInstaller: {ver}")
+    return True, ver
+
+
 def get_jadeui_dll_path() -> Optional[Path]:
     try:
         from jadeui.downloader import find_dll
@@ -64,7 +142,11 @@ def get_jadeui_dll_path() -> Optional[Path]:
     def find_matching_dir(base_path: Path) -> Optional[Path]:
         if not base_path.exists():
             return None
-        for pattern in [f"JadeView_win_{arch}_static_*", f"JadeView_win_{arch}_dynamic_*", f"JadeView_win_{arch}_*"]:
+        for pattern in [
+            f"JadeView_win_{arch}_static_*",
+            f"JadeView_win_{arch}_dynamic_*",
+            f"JadeView_win_{arch}_*",
+        ]:
             matches = list(base_path.glob(pattern))
             if matches:
                 return sorted(matches)[-1]
@@ -156,30 +238,34 @@ def build_nuitka(
     include_jadeui_dll: bool = True,
     compression_level: int = 1,
     onefile: bool = True,
+    auto_install_deps: bool = True,
 ) -> int:
     source_path = Path(source_file)
     if not source_path.exists():
         print(f"错误: 源文件不存在: {source_file}")
         return 1
 
-    nuitka_installed, nuitka_version = check_nuitka()
+    nuitka_installed, nuitka_version = ensure_nuitka(auto_install=auto_install_deps)
     if not nuitka_installed:
-        print("错误: 未安装 Nuitka")
-        print()
-        print("请先安装 Nuitka 4.0rc7 (推荐，onefile 模式无需 VC++ 运行时):")
-        print(f"  {NUITKA_INSTALL_CMD}")
-        print()
-        print("或安装 PyPI 稳定版:")
-        print("  pip install nuitka")
         return 1
 
-    is_4x = nuitka_version and (
-        nuitka_version.startswith("4.") or nuitka_version.startswith("5.")
-    )
-    if not is_4x and onefile:
-        print(f"提示: 当前 Nuitka 版本 ({nuitka_version})")
-        print("  onefile 模式可能需要目标系统安装 VC++ 运行时")
-        print(f"  推荐升级: {NUITKA_INSTALL_CMD}")
+    major = _nuitka_major(nuitka_version)
+    if onefile and (major is None or major < 4):
+        print(f"提示: 当前 Nuitka 版本 ({nuitka_version}) 低于 4.0")
+        print("  onefile 在纯净 Windows 上可能缺少 VCRUNTIME140.dll")
+        if auto_install_deps:
+            print(f"  正在升级到 {NUITKA_PIP_SPEC} …")
+            if _pip_install("--upgrade", NUITKA_PIP_SPEC):
+                ok, ver = check_nuitka()
+                if ok and (_nuitka_major(ver) or 0) >= 4:
+                    nuitka_version = ver
+                    print(f"已升级 Nuitka: {nuitka_version}")
+                else:
+                    print(f"  升级后仍不足 4.0，请手动执行: {NUITKA_INSTALL_CMD}")
+            else:
+                print(f"  升级失败，请手动执行: {NUITKA_INSTALL_CMD}")
+        else:
+            print(f"  推荐升级: {NUITKA_INSTALL_CMD}")
         print()
 
     if output_name is None:
@@ -257,17 +343,15 @@ def build_pyinstaller(
     show_console: bool = False,
     include_jadeui_dll: bool = True,
     onefile: bool = True,
+    auto_install_deps: bool = True,
 ) -> int:
     source_path = Path(source_file)
     if not source_path.exists():
         print(f"错误: 源文件不存在: {source_file}")
         return 1
 
-    installed, version = check_pyinstaller()
+    installed, version = ensure_pyinstaller(auto_install=auto_install_deps)
     if not installed:
-        print("错误: 未安装 PyInstaller")
-        print("  pip install pyinstaller")
-        print("  # 或: pip install jadeui[pyinstaller]")
         return 1
 
     if output_name is None:
@@ -345,6 +429,7 @@ def build(
     include_jadeui_dll: bool = True,
     compression_level: int = 1,
     onefile: bool = True,
+    auto_install_deps: bool = True,
 ) -> int:
     if packager == "pyinstaller":
         return build_pyinstaller(
@@ -357,6 +442,7 @@ def build(
             show_console=show_console,
             include_jadeui_dll=include_jadeui_dll,
             onefile=onefile,
+            auto_install_deps=auto_install_deps,
         )
     return build_nuitka(
         source_file=source_file,
@@ -370,6 +456,7 @@ def build(
         include_jadeui_dll=include_jadeui_dll,
         compression_level=compression_level,
         onefile=onefile,
+        auto_install_deps=auto_install_deps,
     )
 
 
@@ -421,4 +508,5 @@ def run_build(args: argparse.Namespace) -> int:
         include_jadeui_dll=not args.no_jadeui_dll,
         compression_level=args.compress,
         onefile=not args.no_onefile,
+        auto_install_deps=not getattr(args, "no_auto_deps", False),
     )

{jadeui-2.3.2 → jadeui-2.3.3}/jadeui/cli/doctor.py

@@ -66,17 +66,17 @@ def run_doctor(_args: argparse.Namespace) -> int:
         blocking += 1
 
     # Nuitka
-    from .build import NUITKA_INSTALL_CMD, check_nuitka
+    from .build import NUITKA_INSTALL_CMD, _nuitka_major, check_nuitka
 
     ok, ver = check_nuitka()
     if ok:
         note = ""
-        if not (ver.startswith("4.") or ver.startswith("5.")):
-            note = "（建议升级到 4.x 以改善 onefile 兼容性）"
+        if (_nuitka_major(ver) or 0) < 4:
+            note = "（建议升级到 >=4.0，onefile 才不依赖目标机 VC++ 运行时）"
         _ok(f"Nuitka: {ver}{note}")
     else:
-        _warn("未安装 Nuitka（jadeui build 默认打包器）")
-        print(f"       安装: {NUITKA_INSTALL_CMD}")
+        _warn("未安装 Nuitka（jadeui build 默认会自动安装 nuitka>=4.0）")
+        print(f"       也可手动: {NUITKA_INSTALL_CMD}")
 
     # PyInstaller
     from .build import check_pyinstaller
@@ -85,8 +85,8 @@ def run_doctor(_args: argparse.Namespace) -> int:
     if ok:
         _ok(f"PyInstaller: {ver}")
     else:
-        _warn("未安装 PyInstaller（可选: jadeui build --packager pyinstaller）")
-        print("       安装: pip install pyinstaller")
+        _warn("未安装 PyInstaller（jadeui build --packager pyinstaller 时会自动安装）")
+        print("       也可手动: pip install pyinstaller")
 
     # MSVC / clang hints
     if sys.platform == "win32":

{jadeui-2.3.2 → jadeui-2.3.3}/jadeui/cli/japk.py

@@ -8,7 +8,6 @@ import subprocess
 from pathlib import Path
 from typing import List, Optional
 
-
 ASAR_INSTALL_HINT = "npm install -g @electron/asar"
 JADEPACK_URL = "https://jade.run/jadepack"
 JAPK_DOCS_URL = "https://jade.run/docs/api/japk"

{jadeui-2.3.2 → jadeui-2.3.3}/jadeui/cli/main.py

@@ -6,7 +6,6 @@ import argparse
 import sys
 from typing import List, Optional, Sequence
 
-
 _COMMANDS = ("init", "build", "japk", "doctor", "run", "download", "clean")
 
 
@@ -117,6 +116,9 @@ def _build_parser() -> argparse.ArgumentParser:
   jadeui build --include-data-dir web=web --console
   jadeui build --no-onefile -c 2
 
+默认会在缺少打包器时自动安装（Nuitka>=4.0 / PyInstaller，均来自 PyPI）。
+可用 --no-auto-deps 关闭。
+
 输出名优先级:
   -o → tool.jadeui.output / tool.jadeui.name → project.name → 源文件名
         """,
@@ -174,6 +176,11 @@ def _build_parser() -> argparse.ArgumentParser:
         action="store_true",
         help="打包为目录而非单文件",
     )
+    p_build.add_argument(
+        "--no-auto-deps",
+        action="store_true",
+        help="禁止自动安装缺失的打包器（Nuitka / PyInstaller）",
+    )
 
     # ---- japk ----
     p_japk = _add_subparser(
@@ -229,8 +236,7 @@ def _build_parser() -> argparse.ArgumentParser:
         "run",
         help="运行当前项目",
         description=(
-            "运行当前目录下的 JadeUI 入口脚本。"
-            "未指定时读 tool.jadeui.entry，否则 app.py。"
+            "运行当前目录下的 JadeUI 入口脚本。未指定时读 tool.jadeui.entry，否则 app.py。"
         ),
         epilog="""
 示例:

{jadeui-2.3.2 → jadeui-2.3.3}/jadeui/cli/project.py

@@ -172,7 +172,9 @@ def resolve_output_name(
     return sanitize_output_name(source_stem), "source stem"
 
 
-def resolve_entry(cli_script: Optional[str], meta: ProjectMeta, default: str = "app.py") -> Tuple[str, str]:
+def resolve_entry(
+    cli_script: Optional[str], meta: ProjectMeta, default: str = "app.py"
+) -> Tuple[str, str]:
     if cli_script:
         return cli_script, "CLI"
     if meta.entry:

{jadeui-2.3.2 → jadeui-2.3.3}/jadeui/events.py

@@ -375,7 +375,9 @@ class Events:
     FAVICON_UPDATED = "favicon-updated"  # 图标更新（别名）
     JAVASCRIPT_RESULT = "javascript-result"  # JS执行结果 -> @window.on_js_result
     WEBVIEW_DOWNLOAD_STARTED = "webview-download-started"  # 下载开始，可返回"1"阻止 -> @window.on_download_started (v0.3.1+)
-    WEBVIEW_DOWNLOAD_COMPLETED = "webview-download-completed"  # 下载完成 -> @window.on_download_completed
+    WEBVIEW_DOWNLOAD_COMPLETED = (
+        "webview-download-completed"  # 下载完成 -> @window.on_download_completed
+    )
     POSTMESSAGE_RECEIVED = "postmessage-received"  # 接收 PostMessage 消息 (v1.0.2+)
 
     # ==================== 文件事件 ====================

{jadeui-2.3.2 → jadeui-2.3.3}/jadeui/menu.py

@@ -161,9 +161,7 @@ class Menu:
         return dll.jade_menu_item_destroy(menu_id) == 1
 
     @classmethod
-    def _build_items(
-        cls, items: List[MenuItemSpec], parent_menu_id: int = 0
-    ) -> List[int]:
+    def _build_items(cls, items: List[MenuItemSpec], parent_menu_id: int = 0) -> List[int]:
         """在 context-menu 回调内递归构建菜单项，返回该层级的 menu_id 列表。"""
         ids: List[int] = []
         for it in items:

{jadeui-2.3.2 → jadeui-2.3.3}/jadeui/server.py

@@ -104,9 +104,7 @@ class LocalServer:
             raise ServerError(f"Root path does not exist: {path}")
 
         self._root_path = os.path.abspath(path)
-        is_japk_file = os.path.isfile(self._root_path) and self._root_path.lower().endswith(
-            ".japk"
-        )
+        is_japk_file = os.path.isfile(self._root_path) and self._root_path.lower().endswith(".japk")
         # hot_reload only valid for directory mode per official docs
         effective_hot_reload = bool(hot_reload) and not is_japk_file
 

{jadeui-2.3.2 → jadeui-2.3.3}/jadeui/window.py

@@ -1518,9 +1518,7 @@ class Window(EventEmitter):
             if headers:
                 headers_json = _json_dumps(headers, ensure_ascii=False).encode("utf-8")
             # JadeView 2.x: navigate_to_url(window_id, url, headers_json)
-            self.dll_manager.navigate_to_url(
-                self.id, url.encode("utf-8"), headers_json
-            )
+            self.dll_manager.navigate_to_url(self.id, url.encode("utf-8"), headers_json)
         return self
 
     def navigate(

{jadeui-2.3.2 → jadeui-2.3.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "jadeui"
-version = "2.3.2"
+version = "2.3.3"
 description = "Python SDK for JadeView - Create desktop applications with WebView"
 readme = "README.md"
 license = {text = "MIT"}
@@ -35,8 +35,7 @@ dev = [
     "mypy>=1.0",
     "build>=1.0",
     "imageio",
-    # nuitka 需要手动安装 4.0rc7 版本以支持 onefile 模式无需 vcruntime:
-    # pip install https://github.com/HG-ha/jadeui/raw/main/scripts/nuitka-4.0.rc7.zip
+    # Nuitka：jadeui build 默认会自动安装 nuitka>=4.0（正式版已修复 onefile VC++ 问题）
 ]
 pyinstaller = [
     "pyinstaller>=6.0",