jettask 0.2.8__py3-none-any.whl → 0.2.9__py3-none-any.whl

jettask/core/cli.py

@@ -475,28 +475,28 @@ def scheduler(task_center, interval, batch_size, check_interval, debug):
         click.echo("\nShutdown complete")
 
 @cli.command()
-@click.option('--port', default=5173, help='前端开发服务器端口')
-@click.option('--host', default='0.0.0.0', help='前端开发服务器监听地址')
+@click.option('--port', default=8080, help='前端服务器端口')
+@click.option('--host', default='0.0.0.0', help='前端服务器监听地址')
 @click.option('--auto-install', is_flag=True, default=True, help='自动安装缺失的依赖')
 @click.option('--force-install', is_flag=True, help='强制重新安装依赖')
-@click.option('--build', is_flag=True, help='构建生产版本而不是启动开发服务器')
-def frontend(port, host, auto_install, force_install, build):
+@click.option('--build-only', is_flag=True, help='仅构建生产版本，不启动服务器')
+def frontend(port, host, auto_install, force_install, build_only):
     """启动 WebUI 前端界面
     
-    自动检测环境并启动前端开发服务器：
+    启动生产版本服务器：
     1. 检查 Node.js 和 npm 是否安装
-    2. 自动安装缺失的依赖
-    3. 启动开发服务器或构建生产版本
+    2. 复制前端代码到用户目录并安装依赖
+    3. 构建并启动生产版本服务器
     
     示例：
-      # 启动开发服务器（默认）
+      # 启动生产版本服务器（默认）
       jettask frontend
       
       # 指定端口
       jettask frontend --port 3000
       
-      # 构建生产版本
-      jettask frontend --build
+      # 仅构建生产版本
+      jettask frontend --build-only
       
       # 强制重新安装依赖
       jettask frontend --force-install
@@ -505,12 +505,79 @@ def frontend(port, host, auto_install, force_install, build):
     import shutil
     from pathlib import Path
     
-    # 获取前端目录路径
-    frontend_dir = Path(__file__).parent.parent / "webui" / "frontend"
-    if not frontend_dir.exists():
-        click.echo(f"错误：前端目录不存在: {frontend_dir}", err=True)
+    # 获取源前端目录路径（包中的）
+    source_frontend_dir = Path(__file__).parent.parent / "webui" / "frontend"
+    if not source_frontend_dir.exists():
+        click.echo(f"错误：前端源目录不存在: {source_frontend_dir}", err=True)
         sys.exit(1)
     
+    # 获取用户工作目录（在用户主目录下）
+    user_home = Path.home()
+    user_jettask_dir = user_home / ".jettask"
+    user_frontend_dir = user_jettask_dir / "frontend"
+    
+    # 确保用户目录存在
+    user_jettask_dir.mkdir(parents=True, exist_ok=True)
+    
+    # 检查是否需要复制/更新前端代码
+    should_copy = False
+    if not user_frontend_dir.exists():
+        should_copy = True
+        click.echo(f"首次使用，正在初始化前端环境...")
+    else:
+        # 检查版本或时间戳来决定是否需要更新
+        source_package_json = source_frontend_dir / "package.json"
+        user_package_json = user_frontend_dir / "package.json"
+        if not user_package_json.exists():
+            should_copy = True
+        else:
+            # 比较修改时间
+            if source_package_json.stat().st_mtime > user_package_json.stat().st_mtime:
+                should_copy = True
+                click.echo("检测到前端代码更新，正在同步...")
+    
+    if should_copy:
+        # 复制前端代码到用户目录
+        if user_frontend_dir.exists():
+            # 保留 node_modules 和 dist 目录
+            node_modules_backup = None
+            dist_backup = None
+            
+            node_modules_dir = user_frontend_dir / "node_modules"
+            dist_dir = user_frontend_dir / "dist"
+            
+            if node_modules_dir.exists() and not force_install:
+                # 备份 node_modules
+                node_modules_backup = user_jettask_dir / "node_modules_backup"
+                if node_modules_backup.exists():
+                    shutil.rmtree(node_modules_backup)
+                shutil.move(str(node_modules_dir), str(node_modules_backup))
+            
+            if dist_dir.exists():
+                # 备份 dist
+                dist_backup = user_jettask_dir / "dist_backup"
+                if dist_backup.exists():
+                    shutil.rmtree(dist_backup)
+                shutil.move(str(dist_dir), str(dist_backup))
+            
+            # 删除旧的前端目录
+            shutil.rmtree(user_frontend_dir)
+        
+        # 复制新的前端代码
+        shutil.copytree(source_frontend_dir, user_frontend_dir, ignore=shutil.ignore_patterns('node_modules', 'dist', '.git'))
+        
+        # 恢复备份
+        if 'node_modules_backup' in locals() and node_modules_backup and node_modules_backup.exists():
+            shutil.move(str(node_modules_backup), str(user_frontend_dir / "node_modules"))
+        
+        if 'dist_backup' in locals() and dist_backup and dist_backup.exists():
+            shutil.move(str(dist_backup), str(user_frontend_dir / "dist"))
+        
+        click.echo(f"✓ 前端代码已同步到: {user_frontend_dir}")
+    
+    # 工作目录切换到用户前端目录
+    frontend_dir = user_frontend_dir
+    
     # 检查 Node.js 是否安装
     node_cmd = shutil.which('node')
     if not node_cmd:
@@ -541,7 +608,7 @@ def frontend(port, host, auto_install, force_install, build):
     
     # 切换到前端目录
     os.chdir(frontend_dir)
-    click.echo(f"切换到前端目录: {frontend_dir}")
+    click.echo(f"工作目录: {frontend_dir}")
     
     # 检查 package.json 是否存在
     package_json = frontend_dir / "package.json"
@@ -583,48 +650,71 @@ def frontend(port, host, auto_install, force_install, build):
     
     # 构建或启动
     try:
-        if build:
-            # 构建生产版本
+        # 构建生产版本
+        dist_dir = frontend_dir / "dist"
+        
+        # 检查是否需要构建
+        need_build = not dist_dir.exists() or build_only
+        
+        # 如果 dist 不存在或明确要求构建，则进行构建
+        if need_build:
             click.echo("\n正在构建生产版本...")
             subprocess.run([npm_cmd, 'run', 'build'], check=True)
             
-            # 显示构建结果
-            dist_dir = frontend_dir.parent / "static" / "dist"
             if dist_dir.exists():
-                click.echo(f"\n✓ 构建完成！输出目录: {dist_dir}")
                 # 统计文件
                 files = list(dist_dir.rglob('*'))
                 file_count = len([f for f in files if f.is_file()])
                 total_size = sum(f.stat().st_size for f in files if f.is_file())
+                click.echo(f"\n✓ 构建完成！")
+                click.echo(f"  - 输出目录: {dist_dir}")
                 click.echo(f"  - 文件数量: {file_count}")
                 click.echo(f"  - 总大小: {total_size / 1024 / 1024:.2f} MB")
             else:
-                click.echo("警告：构建完成但未找到输出目录")
-        else:
-            # 启动开发服务器
-            click.echo(f"\n正在启动前端开发服务器...")
+                click.echo("错误：构建失败，未生成输出目录", err=True)
+                sys.exit(1)
+        
+        # 如果不是仅构建模式，启动生产服务器
+        if not build_only:
+            if not dist_dir.exists():
+                click.echo("错误：未找到构建输出，请先运行构建", err=True)
+                sys.exit(1)
+            
+            click.echo(f"\n正在启动生产版本服务器...")
             click.echo(f"  - 地址: http://{host}:{port}")
             click.echo(f"  - 本地访问: http://localhost:{port}")
+            click.echo(f"  - 静态文件目录: {dist_dir}")
             click.echo("\n按 Ctrl+C 停止服务器\n")
             
-            # 构建启动命令
-            cmd = [npm_cmd, 'run', 'dev']
-            if host != 'localhost':
-                cmd.extend(['--', '--host', host])
-            if port != 5173:
-                cmd.extend(['--port', str(port)])
+            # 使用 Python 内置的 HTTP 服务器提供静态文件
+            import http.server
+            import socketserver
+            
+            class Handler(http.server.SimpleHTTPRequestHandler):
+                def __init__(self, *args, **kwargs):
+                    super().__init__(*args, directory=str(dist_dir), **kwargs)
+                
+                def do_GET(self):
+                    # 对于 SPA 应用，所有路由都返回 index.html
+                    if self.path != '/' and not Path(dist_dir / self.path[1:]).exists():
+                        self.path = '/index.html'
+                    return super().do_GET()
+                
+                def log_message(self, format, *args):
+                    # 自定义日志格式
+                    click.echo(f"[{self.log_date_time_string()}] {format % args}")
             
-            # 启动开发服务器
-            process = subprocess.Popen(cmd)
-            process.wait()
+            # 创建服务器
+            with socketserver.TCPServer((host, port), Handler) as httpd:
+                try:
+                    httpd.serve_forever()
+                except KeyboardInterrupt:
+                    pass
     except subprocess.CalledProcessError as e:
         click.echo(f"错误：命令执行失败 - {e}", err=True)
         sys.exit(1)
     except KeyboardInterrupt:
         click.echo("\n停止前端服务器")
-        if 'process' in locals():
-            process.terminate()
-            process.wait()
 
 def main():
     """主入口函数"""

{jettask-0.2.8.dist-info → jettask-0.2.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jettask
-Version: 0.2.8
+Version: 0.2.9
 Summary: A high-performance distributed task queue system with web monitoring
 Author-email: JetTask Team <support@jettask.io>
 License-Expression: MIT

{jettask-0.2.8.dist-info → jettask-0.2.9.dist-info}/RECORD

@@ -7,7 +7,7 @@ jettask/config/performance.py,sha256=bOdLEskfB_6cRfS10IRgmtKEsJw_CaIZsPHbXxaHwbU
 jettask/core/__init__.py,sha256=CvBoBCERXCo-jgnkPqAuIgT4uC7oQMnSi7okRxMi6Vc,181
 jettask/core/app.py,sha256=D6wqdGIVR8E1a7RNevNDaICfKGDsea4RqS9aRlMU810,74906
 jettask/core/app_importer.py,sha256=B8WiSUz5_O5jlFIBr1CxI_F2gqFYK6ItpONiY_4AiXI,10266
-jettask/core/cli.py,sha256=QG7MOE3m89cQSyHwEiGTzKlFaWHJOFLWqpY6aLdV4Wc,24452
+jettask/core/cli.py,sha256=yXbIh8e6U2VnBq6t_vB0zbhGTfMjKW2qnWkR8E-Ehn4,28477
 jettask/core/consumer_manager.py,sha256=7z3IBvH85YD61ZkVNfOVsuP5NaAwV2Ki8aVz9TCplAM,79870
 jettask/core/context.py,sha256=XI4Q1s75NIWImcrHIkCLgGo_kpuJIk8MlBoNIJuEfF0,993
 jettask/core/delay_scanner.py,sha256=rwbIA7SFyOxAV14FW7NB40_djFrrqJJpNkpOri7XcZI,8394
@@ -164,9 +164,9 @@ jettask/webui/models/__init__.py,sha256=5cv0oZksj1B3_rzCqsPmF3Gn9NRZLwzMnaJ8bOKG
 jettask/webui/models/namespace.py,sha256=jDj-hZF_-wXzrWAWVDyZVU0JUWDax9apb4Gyykwg-rE,2006
 jettask/webui/sql/batch_upsert_functions.sql,sha256=5eWOhOD8gWHhtcop_BrCpZTxPFeyBHtt_leNQZO89Cs,6615
 jettask/webui/sql/init_database.sql,sha256=CSjhBZldtfV0SGBLTFf576ALaRfCFe3wywpezzkX1TQ,22369
-jettask-0.2.8.dist-info/licenses/LICENSE,sha256=sKR8OPWvnqxzcHAmnaVSANpRpeM0Z52PNLCB0ZlFN6c,1062
-jettask-0.2.8.dist-info/METADATA,sha256=qqiSm1sQjdaDL6zI70A6eFcOZHHEWQGIyfNIuk2cm0o,2955
-jettask-0.2.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jettask-0.2.8.dist-info/entry_points.txt,sha256=VC3byRkkSfRHu_QzczGtpGjcFERkJUlCrD__TFLVqxI,153
-jettask-0.2.8.dist-info/top_level.txt,sha256=uymyRUF87-OsSurk5NhpeTW0jy3Wltnn91Zoa6jmAaw,8
-jettask-0.2.8.dist-info/RECORD,,
+jettask-0.2.9.dist-info/licenses/LICENSE,sha256=sKR8OPWvnqxzcHAmnaVSANpRpeM0Z52PNLCB0ZlFN6c,1062
+jettask-0.2.9.dist-info/METADATA,sha256=o1iIWSh4caLbG86b_qodkYtVdBoDUldjUZKnrGGlcNI,2955
+jettask-0.2.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jettask-0.2.9.dist-info/entry_points.txt,sha256=VC3byRkkSfRHu_QzczGtpGjcFERkJUlCrD__TFLVqxI,153
+jettask-0.2.9.dist-info/top_level.txt,sha256=uymyRUF87-OsSurk5NhpeTW0jy3Wltnn91Zoa6jmAaw,8
+jettask-0.2.9.dist-info/RECORD,,