ascript 1.2.7__tar.gz → 1.2.8__tar.gz

{ascript-1.2.7 → ascript-1.2.8}/PKG-INFO

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

{ascript-1.2.7 → ascript-1.2.8}/ascript/windows/resources/templates/windows/pyproject.toml

@@ -26,7 +26,7 @@ include-package-data = true
 
 [tool.setuptools.package-data]
 # 这里的 key 必须和上面 packages 里的名字一致
-"_project_name_" = ["res/**/*", "config.json", "build.as"]
+"_project_name_" = ["res/**/*", "config.json", "build.as","pyarmor_runtime_000000/**/*"]
 
 [tool.setuptools.exclude-package-data]
 "_project_name_" = ["sercert/**/*"]

{ascript-1.2.7 → ascript-1.2.8}/ascript/windows/system/env.py

@@ -7,6 +7,7 @@ import ctypes
 import psutil
 import time
 from pkginfo import Wheel  # 确保主环境已安装 pkginfo
+import urllib
 
 
 class EnvManager:
@@ -110,16 +111,48 @@ class EnvManager:
                 shutil.rmtree(env_dir, ignore_errors=True)
             return False
 
+    def _get_best_index(self):
+        """测速逻辑：对比官方源和清华源，返回最快的那个"""
+        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):
         abs_env_dir = os.path.abspath(env_dir)
         abs_wheel_path = os.path.abspath(wheel_path)
         pip_path = self.get_pip_exe(user_id)
 
+        # 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 "{abs_wheel_path}" '
+            f'"{pip_path}" install --no-cache-dir {extra_args} "{abs_wheel_path}" '
             f'|| (echo. && echo ------------------------------------------------ && '
             f'echo [错误] 部署失败！请查看上方红字报错原因。 && '
             f'echo 解决后关闭此窗口，重新启动程序即可。 && '
@@ -127,7 +160,7 @@ class EnvManager:
         )
 
         full_cmd = f'cmd /s /c "{combined_payload}"'
-        res = subprocess.run(full_cmd, creationflags=0x00000010, check=False)
+        res = subprocess.run(full_cmd, creationflags=0x00000010 if show_console else 0, check=False)
 
         if res.returncode != 0:
             raise RuntimeError("Installation command failed.")

{ascript-1.2.7 → ascript-1.2.8}/ascript.egg-info/PKG-INFO

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

{ascript-1.2.7 → ascript-1.2.8}/pyproject.toml

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