frp-tunnel 1.0.5__tar.gz → 1.0.6__tar.gz

{frp_tunnel-1.0.5 → frp_tunnel-1.0.6}/.gitignore

@@ -80,6 +80,7 @@ venv/
 ENV/
 env.bak/
 venv.bak/
+build_env/
 
 # Spyder project settings
 .spyderproject
@@ -99,6 +100,9 @@ dmypy.json
 # Pyre type checker
 .pyre/
 
+# PyPI credentials
+.pypirc
+
 # FRP specific
 *.log
 *.pid
@@ -116,11 +120,20 @@ config/local_*
 .idea/
 *.swp
 *.swo
+*~
 
-# macOS
+# OS
 .DS_Store
-
-# Windows
-Thumbs.db
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
 ehthumbs.db
+Thumbs.db
 Desktop.ini
+
+# Temporary files
+*.tmp
+*.temp
+.tmp/
+.temp/

{frp_tunnel-1.0.5/frp_tunnel.egg-info → frp_tunnel-1.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: frp-tunnel
-Version: 1.0.5
+Version: 1.0.6
 Summary: Easy SSH tunneling with FRP - One command setup for Google Colab and remote servers
 Author-email: Your Name <your.email@example.com>
 License-Expression: MIT

{frp_tunnel-1.0.5 → frp_tunnel-1.0.6/frp_tunnel.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: frp-tunnel
-Version: 1.0.5
+Version: 1.0.6
 Summary: Easy SSH tunneling with FRP - One command setup for Google Colab and remote servers
 Author-email: Your Name <your.email@example.com>
 License-Expression: MIT

{frp_tunnel-1.0.5 → frp_tunnel-1.0.6}/frp_tunnel.egg-info/SOURCES.txt

@@ -11,7 +11,7 @@ ROADMAP.md
 SECURITY.md
 SKILL_SHOWCASE.md
 publish.bat
-publish.py
+publish.sh
 pyproject.toml
 .github/ISSUE_TEMPLATE/bug_report.yml
 .github/ISSUE_TEMPLATE/feature_request.yml

frp_tunnel-1.0.6/publish.bat

@@ -0,0 +1,153 @@
+@echo off
+REM 一键发布到 PyPI 脚本 (Windows)
+echo 🚀 一键发布 frp-tunnel 到 PyPI
+echo ==============================
+
+REM 检查是否在正确目录
+if not exist "pyproject.toml" (
+    echo ❌ 错误: 未找到 pyproject.toml，请在项目根目录运行
+    exit /b 1
+)
+
+REM 检查是否在 GitHub Actions 环境
+if defined GITHUB_ACTIONS (
+    echo 🤖 检测到 GitHub Actions 环境
+    if not defined PYPI_API_TOKEN (
+        echo ❌ GitHub Actions 需要设置 PYPI_API_TOKEN secret
+        exit /b 1
+    )
+    if not defined TEST_PYPI_API_TOKEN (
+        echo ❌ GitHub Actions 需要设置 TEST_PYPI_API_TOKEN secret
+        exit /b 1
+    )
+) else (
+    echo 💻 本地环境 - 需要输入令牌
+    
+    REM 检查是否有 PyPI 令牌
+    if not exist "%USERPROFILE%\.pypirc" (
+        echo.
+        echo 📝 需要设置 PyPI 令牌
+        set /p TEST_PYPI_TOKEN="请输入你的 TestPyPI API 令牌 (以 pypi- 开头): "
+        set /p PYPI_TOKEN="请输入你的 PyPI API 令牌 (以 pypi- 开头): "
+        
+        echo [distutils] > "%USERPROFILE%\.pypirc"
+        echo index-servers = >> "%USERPROFILE%\.pypirc"
+        echo     pypi >> "%USERPROFILE%\.pypirc"
+        echo     testpypi >> "%USERPROFILE%\.pypirc"
+        echo. >> "%USERPROFILE%\.pypirc"
+        echo [pypi] >> "%USERPROFILE%\.pypirc"
+        echo repository = https://upload.pypi.org/legacy/ >> "%USERPROFILE%\.pypirc"
+        echo username = __token__ >> "%USERPROFILE%\.pypirc"
+        echo password = %PYPI_TOKEN% >> "%USERPROFILE%\.pypirc"
+        echo. >> "%USERPROFILE%\.pypirc"
+        echo [testpypi] >> "%USERPROFILE%\.pypirc"
+        echo repository = https://test.pypi.org/legacy/ >> "%USERPROFILE%\.pypirc"
+        echo username = __token__ >> "%USERPROFILE%\.pypirc"
+        echo password = %TEST_PYPI_TOKEN% >> "%USERPROFILE%\.pypirc"
+        
+        echo ✅ PyPI 令牌已保存
+        
+        REM 设置 GitHub secrets
+        echo.
+        echo 🔐 设置 GitHub secrets...
+        where gh >nul 2>&1
+        if %errorlevel% equ 0 (
+            echo %PYPI_TOKEN% | gh secret set PYPI_API_TOKEN
+            echo %TEST_PYPI_TOKEN% | gh secret set TEST_PYPI_API_TOKEN
+            echo ✅ GitHub secrets 已设置
+        ) else (
+            echo ⚠️  未找到 gh CLI，请手动设置 GitHub secrets:
+            echo    - PYPI_API_TOKEN
+            echo    - TEST_PYPI_API_TOKEN
+            echo    在: https://github.com/cicy-dev/frp-tunnel/settings/secrets/actions
+        )
+    ) else (
+        echo ✅ 找到现有的 PyPI 配置
+    )
+)
+
+REM 安装构建依赖
+echo.
+echo 📦 安装构建依赖...
+pip install --upgrade build twine
+
+REM 清理旧构建
+echo.
+echo 🧹 清理旧构建...
+if exist "dist" rmdir /s /q dist
+if exist "build" rmdir /s /q build
+
+REM 构建包
+echo.
+echo 📦 构建包...
+python -m build
+
+REM 显示构建的包
+echo.
+echo 📋 构建的包:
+dir dist
+
+REM 本地环境：先发布到 TestPyPI 测试
+if not defined GITHUB_ACTIONS (
+    echo.
+    echo 🧪 本地环境 - 先发布到 TestPyPI 测试...
+    twine upload --repository testpypi dist/*
+    
+    if %errorlevel% equ 0 (
+        echo ✅ TestPyPI 发布成功!
+        echo.
+        echo 🔍 测试 TestPyPI 安装...
+        echo ⏳ 等待 TestPyPI 更新...
+        timeout /t 15 /nobreak >nul
+        
+        pip install --index-url https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple/ frp-tunnel --upgrade
+        
+        echo 🔍 测试命令...
+        frp-tunnel --version
+        
+        echo.
+        echo ✅ TestPyPI 测试通过!
+        echo.
+        set /p continue_pypi="TestPyPI 测试成功，是否继续发布到正式 PyPI? (y/n): "
+        
+        if not "%continue_pypi%"=="y" (
+            echo 🛑 用户取消发布到正式 PyPI
+            exit /b 0
+        )
+    ) else (
+        echo ❌ TestPyPI 发布失败
+        exit /b 1
+    )
+)
+
+REM 发布到正式 PyPI
+echo.
+echo 🚀 发布到正式 PyPI...
+twine upload dist/*
+
+if %errorlevel% equ 0 (
+    echo.
+    echo ✅ 成功发布到 PyPI!
+    
+    REM 测试正式 PyPI 安装
+    echo.
+    echo 🧪 测试正式 PyPI 安装...
+    echo ⏳ 等待 PyPI 更新...
+    timeout /t 10 /nobreak >nul
+    pip install frp-tunnel --upgrade
+    
+    echo.
+    echo 🔍 测试命令...
+    frp-tunnel --version
+    
+    echo.
+    echo 🎉 发布和测试完成!
+    echo 📦 包地址: https://pypi.org/project/frp-tunnel/
+    echo.
+    echo 用户现在可以使用:
+    echo   pip install frp-tunnel
+    echo   frp-tunnel --help
+) else (
+    echo ❌ PyPI 发布失败
+    exit /b 1
+)

frp_tunnel-1.0.6/publish.sh

@@ -0,0 +1,170 @@
+#!/bin/bash
+
+# 一键发布到 PyPI 脚本
+set -e
+
+echo "🚀 一键发布 frp-tunnel 到 PyPI"
+echo "=============================="
+
+cd /home/w3c_offical/projects/frp-tunnel
+
+# 检查是否在 GitHub Actions 环境
+if [ -n "$GITHUB_ACTIONS" ]; then
+    echo "🤖 检测到 GitHub Actions 环境"
+    # GitHub Actions 使用 secrets，不需要手动输入
+    if [ -z "$PYPI_API_TOKEN" ] || [ -z "$TEST_PYPI_API_TOKEN" ]; then
+        echo "❌ GitHub Actions 需要设置 PYPI_API_TOKEN 和 TEST_PYPI_API_TOKEN secrets"
+        exit 1
+    fi
+else
+    echo "💻 本地环境 - 需要输入令牌"
+    
+    # 检查是否有令牌文件
+    if [ ! -f ~/.pypirc ] || ! grep -q "password" ~/.pypirc 2>/dev/null; then
+        echo ""
+        echo "📝 需要设置 PyPI 令牌"
+        echo "请输入你的 TestPyPI API 令牌 (以 pypi- 开头):"
+        read -s TEST_PYPI_TOKEN
+        
+        echo "请输入你的 PyPI API 令牌 (以 pypi- 开头):"
+        read -s PYPI_TOKEN
+        
+        cat > ~/.pypirc << EOF
+[distutils]
+index-servers = 
+    pypi
+    testpypi
+
+[pypi]
+repository = https://upload.pypi.org/legacy/
+username = __token__
+password = $PYPI_TOKEN
+
+[testpypi]
+repository = https://test.pypi.org/legacy/
+username = __token__
+password = $TEST_PYPI_TOKEN
+EOF
+        chmod 600 ~/.pypirc
+        echo "✅ PyPI 令牌已保存"
+        
+        # 设置 GitHub secrets
+        echo ""
+        echo "🔐 设置 GitHub secrets..."
+        if command -v gh >/dev/null 2>&1; then
+            echo "$PYPI_TOKEN" | gh secret set PYPI_API_TOKEN
+            echo "$TEST_PYPI_TOKEN" | gh secret set TEST_PYPI_API_TOKEN
+            echo "✅ GitHub secrets 已设置"
+        else
+            echo "⚠️  未找到 gh CLI，请手动设置 GitHub secrets:"
+            echo "   - PYPI_API_TOKEN"
+            echo "   - TEST_PYPI_API_TOKEN"
+            echo "   在: https://github.com/cicy-dev/frp-tunnel/settings/secrets/actions"
+        fi
+    else
+        echo "✅ 找到现有的 PyPI 配置"
+    fi
+fi
+
+# 构建包
+echo ""
+echo "📦 构建包..."
+rm -rf dist/*
+source build_env/bin/activate
+python -m build
+
+echo ""
+echo "📋 构建的包："
+ls -la dist/
+
+# 本地环境：先发布到 TestPyPI 测试
+if [ -z "$GITHUB_ACTIONS" ]; then
+    echo ""
+    echo "🧪 本地环境 - 先发布到 TestPyPI 测试..."
+    twine upload --repository testpypi dist/*
+    
+    if [ $? -eq 0 ]; then
+        echo "✅ TestPyPI 发布成功!"
+        echo ""
+        echo "🔍 测试 TestPyPI 安装..."
+        
+        # 创建临时测试环境
+        TEST_ENV="/tmp/frp_test_$$"
+        python3 -m venv "$TEST_ENV"
+        source "$TEST_ENV/bin/activate"
+        
+        # 等待 TestPyPI 更新
+        echo "⏳ 等待 TestPyPI 更新..."
+        sleep 15
+        
+        # 从 TestPyPI 安装测试
+        pip install --index-url https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple/ frp-tunnel --upgrade
+        
+        echo "🔍 测试命令..."
+        frp-tunnel --version
+        frp-tunnel --help | head -5
+        
+        # 清理测试环境
+        deactivate
+        rm -rf "$TEST_ENV"
+        
+        echo ""
+        echo "✅ TestPyPI 测试通过!"
+        echo ""
+        read -p "TestPyPI 测试成功，是否继续发布到正式 PyPI? (y/n): " continue_pypi
+        
+        if [ "$continue_pypi" != "y" ]; then
+            echo "🛑 用户取消发布到正式 PyPI"
+            exit 0
+        fi
+    else
+        echo "❌ TestPyPI 发布失败"
+        exit 1
+    fi
+fi
+
+# 发布到正式 PyPI
+echo ""
+echo "🚀 发布到正式 PyPI..."
+twine upload dist/*
+
+if [ $? -eq 0 ]; then
+    echo ""
+    echo "✅ 成功发布到 PyPI!"
+    
+    # 测试正式 PyPI 安装
+    echo ""
+    echo "🧪 测试正式 PyPI 安装..."
+    
+    # 创建临时测试环境
+    TEST_ENV="/tmp/frp_test_$$"
+    python3 -m venv "$TEST_ENV"
+    source "$TEST_ENV/bin/activate"
+    
+    # 等待 PyPI 更新
+    echo "⏳ 等待 PyPI 更新..."
+    sleep 10
+    
+    # 安装并测试
+    pip install frp-tunnel --upgrade
+    
+    echo ""
+    echo "🔍 测试命令..."
+    frp-tunnel --version
+    frp-tunnel --help | head -5
+    
+    # 清理测试环境
+    deactivate
+    rm -rf "$TEST_ENV"
+    
+    echo ""
+    echo "🎉 发布和测试完成！"
+    echo "📦 包地址: https://pypi.org/project/frp-tunnel/"
+    echo ""
+    echo "用户现在可以使用："
+    echo "  pip install frp-tunnel"
+    echo "  frp-tunnel --help"
+else
+    echo "❌ PyPI 发布失败"
+    exit 1
+fi

{frp_tunnel-1.0.5 → frp_tunnel-1.0.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "frp-tunnel"
-version = "1.0.5"
+version = "1.0.6"
 description = "Easy SSH tunneling with FRP - One command setup for Google Colab and remote servers"
 readme = "README.md"
 license = "MIT"

frp_tunnel-1.0.5/publish.bat

@@ -1,43 +0,0 @@
-@echo off
-REM PyPI Publishing Script for Windows
-echo 🚀 Publishing frp-tunnel to PyPI...
-
-REM Check if we're in the right directory
-if not exist "pyproject.toml" (
-    echo ❌ Error: pyproject.toml not found. Run from project root.
-    exit /b 1
-)
-
-REM Install build dependencies
-echo 📦 Installing build dependencies...
-pip install --upgrade build twine
-
-REM Clean previous builds
-echo 🧹 Cleaning previous builds...
-if exist "dist" rmdir /s /q dist
-if exist "build" rmdir /s /q build
-for /d %%i in (*.egg-info) do rmdir /s /q "%%i"
-
-REM Build the package
-echo 🔨 Building package...
-python -m build
-
-REM Check the built package
-echo 🔍 Checking package...
-twine check dist/*
-
-REM Upload to PyPI
-echo 📤 Uploading to PyPI...
-if "%1"=="--test" (
-    echo 📋 Uploading to TestPyPI...
-    twine upload --repository testpypi dist/*
-    echo ✅ Uploaded to TestPyPI: https://test.pypi.org/project/frp-tunnel/
-    echo 🧪 Test install: pip install --index-url https://test.pypi.org/simple/ frp-tunnel
-) else (
-    echo 📋 Uploading to PyPI...
-    twine upload dist/*
-    echo ✅ Published to PyPI: https://pypi.org/project/frp-tunnel/
-    echo 📦 Install: pip install frp-tunnel
-)
-
-echo 🎉 Publishing complete!

frp_tunnel-1.0.5/publish.py

@@ -1,68 +0,0 @@
-#!/usr/bin/env python3
-"""
-PyPI Publishing Script
-"""
-
-import os
-import sys
-import subprocess
-import shutil
-from pathlib import Path
-
-def run_command(cmd, description):
-    """Run command and handle errors"""
-    print(f"🔄 {description}...")
-    try:
-        result = subprocess.run(cmd, shell=True, check=True, capture_output=True, text=True)
-        print(f"✅ {description} completed")
-        return result
-    except subprocess.CalledProcessError as e:
-        print(f"❌ {description} failed: {e.stderr}")
-        sys.exit(1)
-
-def main():
-    """Main publishing function"""
-    print("🚀 Publishing frp-tunnel to PyPI...")
-    
-    # Check if we're in the right directory
-    if not Path("pyproject.toml").exists():
-        print("❌ Error: pyproject.toml not found. Run from project root.")
-        sys.exit(1)
-    
-    # Check for test flag
-    test_mode = "--test" in sys.argv
-    
-    # Install build dependencies
-    run_command("pip install --upgrade build twine", "Installing build dependencies")
-    
-    # Clean previous builds
-    print("🧹 Cleaning previous builds...")
-    for path in ["dist", "build"]:
-        if Path(path).exists():
-            shutil.rmtree(path)
-    
-    for egg_info in Path(".").glob("*.egg-info"):
-        shutil.rmtree(egg_info)
-    
-    # Build the package
-    run_command("python -m build", "Building package")
-    
-    # Check the built package
-    run_command("twine check dist/*", "Checking package")
-    
-    # Upload to PyPI
-    if test_mode:
-        print("📋 Uploading to TestPyPI...")
-        run_command("twine upload --repository testpypi dist/*", "Uploading to TestPyPI")
-        print("✅ Uploaded to TestPyPI: https://test.pypi.org/project/frp-tunnel/")
-        print("🧪 Test install: pip install --index-url https://test.pypi.org/simple/ frp-tunnel")
-    else:
-        print("📋 Uploading to PyPI...")
-        run_command("twine upload dist/*", "Uploading to PyPI")
-        print("✅ Published to PyPI: https://pypi.org/project/frp-tunnel/")
-        print("📦 Install: pip install frp-tunnel")
-    
-    print("🎉 Publishing complete!")
-
-if __name__ == "__main__":
-    main()