ascript 1.3.2__tar.gz → 1.3.3__tar.gz

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

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

{ascript-1.3.2 → 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.2 → 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.2 → ascript-1.3.3}/ascript.egg-info/PKG-INFO

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

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

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