jadeui 0.2.0__tar.gz → 0.3.2__tar.gz

{jadeui-0.2.0 → jadeui-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jadeui
-Version: 0.2.0
+Version: 0.3.2
 Summary: Python SDK for JadeView - Create desktop applications with WebView
 Project-URL: Homepage, https://jade.run
 Project-URL: Documentation, https://jade.run/python-sdk

{jadeui-0.2.0 → jadeui-0.3.2}/jadeui/__init__.py

@@ -67,7 +67,7 @@ from .router import Router
 from .server import LocalServer
 from .window import Backdrop, Theme, Window
 
-__version__ = "0.2.0"
+__version__ = "0.3.2"
 __author__ = "JadeView Team"
 __license__ = "MIT"
 

{jadeui-0.2.0 → jadeui-0.3.2}/jadeui/core/dll.py

@@ -293,6 +293,7 @@ class DLLManager:
         self._try_bind("is_window_minimized", [ctypes.c_uint32], ctypes.c_int)
         self._try_bind("is_window_visible", [ctypes.c_uint32], ctypes.c_int)
         self._try_bind("is_window_focused", [ctypes.c_uint32], ctypes.c_int)
+        self._try_bind("is_window_fullscreen", [ctypes.c_uint32], ctypes.c_int)
 
         # Window focus
         self._try_bind("focus_window", [ctypes.c_uint32], ctypes.c_int)

{jadeui-0.2.0 → jadeui-0.3.2}/jadeui/core/types.py

@@ -146,6 +146,7 @@ class WebViewSettings(ctypes.Structure):
         ("disable_right_click", ctypes.c_int),
         ("ua", ctypes.c_char_p),
         ("preload_js", ctypes.c_char_p),
+        ("allow_fullscreen", ctypes.c_int),  # JadeView 0.2.1+: 控制是否允许页面全屏
     ]
 
     def __init__(
@@ -155,6 +156,7 @@ class WebViewSettings(ctypes.Structure):
         disable_right_click: bool = False,
         ua: Optional[bytes] = None,
         preload_js: Optional[bytes] = None,
+        allow_fullscreen: bool = True,  # 默认允许全屏
     ):
         super().__init__(
             int(autoplay),
@@ -162,6 +164,7 @@ class WebViewSettings(ctypes.Structure):
             int(disable_right_click),
             ua,
             preload_js,
+            int(allow_fullscreen),
         )
 
 

{jadeui-0.2.0 → jadeui-0.3.2}/jadeui/downloader.py

@@ -23,7 +23,7 @@ GITHUB_RELEASE_URL = f"https://github.com/{GITHUB_REPO}/releases/download"
 
 # DLL 版本号（可能与 SDK 版本不同）
 # 当 SDK 修复 bug 但 DLL 未更新时，此版本保持不变
-DLL_VERSION = "0.2.0"
+DLL_VERSION = "0.3.2"
 
 # 链接类型: "static" (推荐) 或 "dynamic"
 # static: DLL内嵌所有依赖，无需额外运行时
@@ -259,8 +259,18 @@ def download_dll(
         print("📂 正在解压...")
 
         with zipfile.ZipFile(tmp_path, "r") as zip_ref:
-            # Extract all files
-            zip_ref.extractall(install_dir)
+            # Check if ZIP contains the expected directory structure
+            namelist = zip_ref.namelist()
+            has_top_dir = any(
+                name.startswith(dist_dir + "/") or name == dist_dir + "/" for name in namelist
+            )
+
+            if has_top_dir:
+                # ZIP contains the directory, extract to install_dir
+                zip_ref.extractall(install_dir)
+            else:
+                # ZIP doesn't contain directory, extract to target_dir
+                zip_ref.extractall(target_dir)
 
         print("✅ 解压完成")
 
@@ -274,7 +284,15 @@ def download_dll(
     # Verify DLL exists
     dll_path = target_dir / dll_name
     if not dll_path.exists():
-        raise RuntimeError(f"解压后未找到 DLL 文件: {dll_path}")
+        # Also check if DLL is directly in install_dir (fallback)
+        alt_path = install_dir / dll_name
+        if alt_path.exists():
+            # Move to correct location
+            import shutil
+
+            shutil.move(str(alt_path), str(dll_path))
+        else:
+            raise RuntimeError(f"解压后未找到 DLL 文件: {dll_path}")
 
     print("\n🎉 安装成功!")
     print(f"   DLL 路径: {dll_path}")

{jadeui-0.2.0 → jadeui-0.3.2}/jadeui/events.py

@@ -248,44 +248,106 @@ class GlobalEventManager:
 # Standard event names
 # 参考: https://jade.run/guides/events/event-types
 class Events:
-    """Standard event name constants"""
-
-    # App lifecycle events
-    APP_READY = "app-ready"
-    WINDOW_ALL_CLOSED = "window-all-closed"
-    BEFORE_QUIT = "before-quit"
-
-    # Window events
-    WINDOW_CREATED = "window-created"
-    APP_WINDOW_CREATED = "app-window-created"
-    WINDOW_CLOSED = "window-closed"
-    WINDOW_CLOSING = "window-closing"
-    WINDOW_RESIZED = "window-resized"
-    WINDOW_STATE_CHANGED = "window-state-changed"
-    WINDOW_MOVED = "window-moved"
-    WINDOW_FOCUSED = "window-focused"
-    WINDOW_BLURRED = "window-blurred"
-    WINDOW_DESTROYED = "window-destroyed"
-    RESIZED = "resized"  # 字符串形式
-
-    # WebView events
-    WEBVIEW_WILL_NAVIGATE = "webview-will-navigate"
-    WEBVIEW_DID_START_LOADING = "webview-did-start-loading"
-    WEBVIEW_DID_FINISH_LOAD = "webview-did-finish-load"
-    WEBVIEW_NEW_WINDOW = "webview-new-window"
-    WEBVIEW_PAGE_TITLE_UPDATED = "webview-page-title-updated"
-    WEBVIEW_PAGE_ICON_UPDATED = "webview-page-icon-updated"
-    FAVICON_UPDATED = "favicon-updated"
-    JAVASCRIPT_RESULT = "javascript-result"
-
-    # File events
-    FILE_DROP = "file-drop"
-
-    # Theme events
-    THEME_CHANGED = "theme-changed"
-
-    # Other events
-    UPDATE_WINDOW_ICON = "update-window-icon"
-
-    # IPC events
-    IPC_MESSAGE = "ipc-message"
+    """Standard event name constants
+
+    事件注册方式指南:
+
+    1. 应用生命周期事件 - 通过 JadeUIApp 注册:
+        ```python
+        from jadeui import JadeUIApp
+        app = JadeUIApp()
+
+        @app.on_ready
+        def handle_ready():
+            print("应用已就绪")
+        ```
+
+    2. 窗口事件 - 通过 Window.on() 或专用装饰器注册:
+        ```python
+        from jadeui import Window
+
+        window = Window(title="示例")
+
+        # 使用专用装饰器（推荐，有类型提示）
+        @window.on_resized
+        def handle_resize(width: int, height: int):
+            print(f"大小: {width}x{height}")
+
+        # 或使用通用 on() 方法
+        @window.on("window-moved")
+        def handle_move(x: int, y: int):
+            print(f"位置: ({x}, {y})")
+        ```
+
+    3. IPC 事件 - 通过 IPCManager 注册:
+        ```python
+        from jadeui.ipc import IPCManager
+
+        ipc = IPCManager()
+
+        @ipc.on("myChannel")
+        def handle_message(window_id: int, message: str):
+            return "收到"
+        ```
+
+    Window 专用装饰器列表:
+        - @window.on_resized          -> WINDOW_RESIZED
+        - @window.on_moved            -> WINDOW_MOVED
+        - @window.on_focused          -> WINDOW_FOCUSED
+        - @window.on_blurred          -> WINDOW_BLURRED
+        - @window.on_closing          -> WINDOW_CLOSING (可阻止关闭)
+        - @window.on_state_changed    -> WINDOW_STATE_CHANGED
+        - @window.on_navigate         -> WEBVIEW_WILL_NAVIGATE (可阻止导航)
+        - @window.on_page_loaded      -> WEBVIEW_DID_FINISH_LOAD
+        - @window.on_title_updated    -> WEBVIEW_PAGE_TITLE_UPDATED
+        - @window.on_new_window       -> WEBVIEW_NEW_WINDOW (可阻止新窗口)
+        - @window.on_download_started -> WEBVIEW_DOWNLOAD_STARTED (可阻止下载, v0.3.1+)
+        - @window.on_file_dropped     -> FILE_DROP
+        - @window.on_js_result        -> JAVASCRIPT_RESULT
+    """
+
+    # ==================== 应用生命周期事件 ====================
+    # 注册方式: @app.on_ready, @app.on_all_windows_closed 等
+    APP_READY = "app-ready"  # 应用初始化完成
+    WINDOW_ALL_CLOSED = "window-all-closed"  # 所有窗口关闭
+    BEFORE_QUIT = "before-quit"  # 应用即将退出
+
+    # ==================== 窗口事件 ====================
+    # 注册方式: @window.on("事件名") 或专用装饰器
+    WINDOW_CREATED = "window-created"  # 窗口创建完成
+    APP_WINDOW_CREATED = "app-window-created"  # 同上，别名
+    WINDOW_CLOSED = "window-closed"  # 窗口已关闭
+    WINDOW_CLOSING = "window-closing"  # 窗口即将关闭，可返回1阻止 -> @window.on_closing
+    WINDOW_RESIZED = "window-resized"  # 窗口大小改变 -> @window.on_resized
+    WINDOW_STATE_CHANGED = "window-state-changed"  # 最大化/还原状态改变 -> @window.on_state_changed
+    WINDOW_MOVED = "window-moved"  # 窗口位置改变 -> @window.on_moved
+    WINDOW_FOCUSED = "window-focused"  # 窗口获得焦点 -> @window.on_focused
+    WINDOW_BLURRED = "window-blurred"  # 窗口失去焦点 -> @window.on_blurred
+    WINDOW_DESTROYED = "window-destroyed"  # 窗口销毁
+    RESIZED = "resized"  # 窗口大小改变（旧格式，兼容用）
+
+    # ==================== WebView 事件 ====================
+    # 注册方式: @window.on("事件名") 或专用装饰器
+    WEBVIEW_WILL_NAVIGATE = "webview-will-navigate"  # 即将导航，可返回1阻止 -> @window.on_navigate
+    WEBVIEW_DID_START_LOADING = "webview-did-start-loading"  # 开始加载
+    WEBVIEW_DID_FINISH_LOAD = "webview-did-finish-load"  # 加载完成 -> @window.on_page_loaded
+    WEBVIEW_NEW_WINDOW = "webview-new-window"  # 请求新窗口，可返回1阻止 -> @window.on_new_window
+    WEBVIEW_PAGE_TITLE_UPDATED = (
+        "webview-page-title-updated"  # 标题更新 -> @window.on_title_updated
+    )
+    WEBVIEW_PAGE_ICON_UPDATED = "webview-page-icon-updated"  # 图标更新
+    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+)
+    )
+
+    # ==================== 文件事件 ====================
+    FILE_DROP = "file-drop"  # 文件拖放到窗口 -> @window.on_file_dropped
+
+    # ==================== 主题事件 ====================
+    THEME_CHANGED = "theme-changed"  # 系统主题改变
+
+    # ==================== 其他事件 ====================
+    UPDATE_WINDOW_ICON = "update-window-icon"  # 更新窗口图标
+    IPC_MESSAGE = "ipc-message"  # IPC 消息（通过 IPCManager 注册）

{jadeui-0.2.0 → jadeui-0.3.2}/jadeui/window.py

@@ -92,6 +92,10 @@ def _extract_js_result(d: Dict) -> tuple:
     return (d.get("callbackId"), d.get("result"))
 
 
+def _extract_download(d: Dict) -> tuple:
+    return (d.get("url", ""), d.get("filename", ""))
+
+
 # Event extractors mapping: event_name -> (extractor, pass_dict_if_no_extractor)
 _EVENT_EXTRACTORS: Dict[str, Callable[[Dict], tuple]] = {
     # Window events
@@ -111,6 +115,7 @@ _EVENT_EXTRACTORS: Dict[str, Callable[[Dict], tuple]] = {
     "webview-new-window": _extract_new_window,
     "webview-page-title-updated": _extract_title,
     "favicon-updated": _extract_favicon,
+    "webview-download-started": _extract_download,  # v0.3.1+
     # Other events
     "javascript-result": _extract_js_result,
 }
@@ -190,6 +195,8 @@ class Window(EventEmitter):
                 - disable_right_click (bool): Disable right-click menu (default: True)
                 - user_agent (str): Custom user agent string
                 - preload_js (str): JavaScript to run before page load
+                - allow_fullscreen (bool): Allow page to enter fullscreen (default: True)
+                    Note: Requires JadeView DLL 0.2.1+
         """
         super().__init__()
 
@@ -231,6 +238,7 @@ class Window(EventEmitter):
         self._options.setdefault("disable_right_click", True)
         self._options.setdefault("user_agent", None)
         self._options.setdefault("preload_js", None)
+        self._options.setdefault("allow_fullscreen", True)  # JadeView 0.2.1+
 
         # Callback references to prevent garbage collection
         self._callbacks: list = []
@@ -241,6 +249,10 @@ class Window(EventEmitter):
         # 待应用的设置（在窗口创建前设置的属性）
         self._pending_backdrop: Optional[str] = None
 
+        # JavaScript 执行回调注册表: callbackId -> callback
+        self._js_callbacks: Dict[int, Callable[[Any], Any]] = {}
+        self._js_callback_id_counter: int = 0
+
     # 需要通过 jade_on 注册到 DLL 的事件列表
     # 参考: https://jade.run/guides/events/event-types
     JADE_ON_EVENTS = {
@@ -263,6 +275,7 @@ class Window(EventEmitter):
         "webview-page-title-updated",  # {"title": "新标题", "window_id": 窗口ID}
         "webview-page-icon-updated",  # JSON对象
         "favicon-updated",  # {"favicon": "图标URL"}
+        "webview-download-started",  # {"url": "下载URL", ...} 可返回1阻止 (v0.3.1+)
         # 其他事件
         "theme-changed",  # {}
         "javascript-result",  # {"callbackId": 回调ID, "result": 执行结果}
@@ -509,6 +522,52 @@ class Window(EventEmitter):
         self._register_jade_on_event("webview-new-window", callback)
         return callback
 
+    def on_js_result(self, callback: Callable[[int, Any], Any]) -> Callable[[int, Any], Any]:
+        """Register a callback for JavaScript execution result events.
+
+        This listens to the native javascript-result event from the DLL.
+        For simpler usage, consider using execute_js() with a callback parameter.
+
+        Args:
+            callback: Function to call when JS execution completes.
+                - callback_id (int): The callback ID
+                - result (Any): The execution result
+
+        Example:
+            @window.on_js_result
+            def handle_js_result(callback_id: int, result):
+                print(f"JS result [{callback_id}]: {result}")
+        """
+        self._register_jade_on_event("javascript-result", callback)
+        return callback
+
+    def on_download_started(
+        self, callback: Callable[[str, str], Union[bool, int, None]]
+    ) -> Callable[[str, str], Union[bool, int, None]]:
+        """Register a callback for download started events.
+
+        Return True or 1 to prevent the download.
+
+        Note:
+            Requires JadeView DLL version 0.3.1 or above.
+
+        Args:
+            callback: Function to call when a download starts.
+                - url (str): Download URL
+                - filename (str): Suggested filename
+                Returns: True/1 to prevent download, False/0/None to allow.
+
+        Example:
+            @window.on_download_started
+            def handle_download(url: str, filename: str):
+                print(f"Download: {filename} from {url}")
+                if filename.endswith(".exe"):
+                    return True  # Block exe downloads
+                return False  # Allow download
+        """
+        self._register_jade_on_event("webview-download-started", callback)
+        return callback
+
     # ==================== Internal Event Registration ====================
 
     def _register_jade_on_event(self, event: str, callback: Callable[..., Any]) -> None:
@@ -793,12 +852,16 @@ class Window(EventEmitter):
     def set_fullscreen(self, fullscreen: bool) -> "Window":
         """Set fullscreen mode
 
+        Note:
+            Requires JadeView DLL version 0.2.1 or above.
+
         Args:
             fullscreen: Whether to enable fullscreen
 
         Returns:
             Self for chaining
         """
+        self._options["fullscreen"] = fullscreen
         if self.id is not None:
             self.dll_manager.set_window_fullscreen(self.id, 1 if fullscreen else 0)
         return self
@@ -1025,29 +1088,109 @@ class Window(EventEmitter):
         """
         return self.load_url(url)
 
-    def execute_js(self, script: str) -> "Window":
+    def execute_js(
+        self,
+        script: str,
+        callback: Optional[Callable[[Any], Any]] = None,
+    ) -> "Window":
         """Execute JavaScript in the window
 
         Args:
             script: JavaScript code to execute
+            callback: Optional callback function to receive the result.
+                      Will be called with the JavaScript execution result.
+                      Note: Requires registering javascript-result event handler.
 
         Returns:
             Self for chaining
+
+        Example:
+            # Without callback
+            window.execute_js("console.log('Hello')")
+
+            # With callback
+            def on_result(result):
+                print(f"Result: {result}")
+            window.execute_js("1 + 1", callback=on_result)
         """
         if self.id is not None:
-            self.dll_manager.execute_javascript(self.id, script.encode("utf-8"))
+            if callback is not None:
+                # 生成唯一的 callbackId 并注册回调
+                self._js_callback_id_counter += 1
+                callback_id = self._js_callback_id_counter
+                self._js_callbacks[callback_id] = callback
+
+                # 确保已注册 javascript-result 事件处理器
+                self._ensure_js_result_handler()
+
+                # 包装脚本以返回 callbackId
+                wrapped_script = f"""
+(function() {{
+    try {{
+        var result = eval({repr(script)});
+        if (typeof jade !== 'undefined' && jade.ipcSend) {{
+            jade.ipcSend('__js_result__', JSON.stringify({{
+                callbackId: {callback_id},
+                result: result
+            }}));
+        }}
+    }} catch (e) {{
+        if (typeof jade !== 'undefined' && jade.ipcSend) {{
+            jade.ipcSend('__js_result__', JSON.stringify({{
+                callbackId: {callback_id},
+                error: e.message
+            }}));
+        }}
+    }}
+}})();
+"""
+                self.dll_manager.execute_javascript(self.id, wrapped_script.encode("utf-8"))
+            else:
+                self.dll_manager.execute_javascript(self.id, script.encode("utf-8"))
         return self
 
-    def eval(self, script: str) -> "Window":
+    def _ensure_js_result_handler(self) -> None:
+        """确保已注册 JavaScript 结果处理器"""
+        if "__js_result__" in self._registered_jade_events:
+            return
+
+        from .ipc import IPCManager
+
+        ipc = IPCManager(self.dll_manager)
+
+        @ipc.on("__js_result__")
+        def handle_js_result(window_id: int, message: str) -> int:
+            try:
+                data = _json_loads(message) if message else {}
+                callback_id = data.get("callbackId")
+                result = data.get("result")
+                error = data.get("error")
+
+                if callback_id and callback_id in self._js_callbacks:
+                    callback = self._js_callbacks.pop(callback_id)
+                    if error:
+                        logger.error(f"JS execution error: {error}")
+                        callback(None)
+                    else:
+                        callback(result)
+            except Exception as e:
+                logger.error(f"Error handling JS result: {e}")
+            return 1
+
+        self._registered_jade_events.add("__js_result__")
+        logger.info("JavaScript result handler registered")
+
+    def eval(self, script: str, callback: Optional[Callable[[Any], Any]] = None) -> "Window":
         """Execute JavaScript (alias for execute_js)
 
         Args:
             script: JavaScript code to execute
+            callback: Optional callback function to receive the result
 
         Returns:
             Self for chaining
         """
-        return self.execute_js(script)
+        return self.execute_js(script, callback)
 
     def reload(self) -> "Window":
         """Reload the current page in the WebView
@@ -1104,8 +1247,17 @@ class Window(EventEmitter):
 
     @property
     def is_fullscreen(self) -> bool:
-        """Check if window is in fullscreen mode"""
-        # Note: DLL might not provide this query, track locally
+        """Check if window is in fullscreen mode
+
+        Note:
+            Requires JadeView DLL version 0.2.1 or above for accurate query.
+            Falls back to local state tracking for older versions.
+        """
+        if self.id is not None:
+            # Try to query DLL first (JadeView 0.2.1+)
+            if self.dll_manager.has_function("is_window_fullscreen"):
+                return self.dll_manager.is_window_fullscreen(self.id) == 1
+        # Fallback to local tracking
         return self._options.get("fullscreen", False)
 
     # ==================== Window Creation ====================
@@ -1166,6 +1318,7 @@ class Window(EventEmitter):
             disable_right_click=self._options.get("disable_right_click", False),
             ua=user_agent.encode("utf-8") if user_agent else None,
             preload_js=preload_js.encode("utf-8") if preload_js else None,
+            allow_fullscreen=self._options.get("allow_fullscreen", True),
         )
 
         # Prepare URL

{jadeui-0.2.0 → jadeui-0.3.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "jadeui"
-version = "0.2.0"
+version = "0.3.2"
 description = "Python SDK for JadeView - Create desktop applications with WebView"
 readme = "README.md"
 license = {text = "MIT"}