cpolar-connect 0.1.0.dev0__tar.gz → 0.1.0.dev1__tar.gz

{cpolar_connect-0.1.0.dev0 → cpolar_connect-0.1.0.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cpolar-connect
-Version: 0.1.0.dev0
+Version: 0.1.0.dev1
 Summary: Easy-to-use CLI tool for cpolar tunnel management and SSH connections
 Project-URL: Homepage, https://github.com/Hoper-J/cpolar-connect
 Project-URL: Repository, https://github.com/Hoper-J/cpolar-connect.git
@@ -317,9 +317,6 @@ MIT License - 详见 [LICENSE](LICENSE)
 ---
 
 <div align="center">
-
-**如果觉得有用，请给个 ⭐ Star！**
-
-Made with ❤️ for developers
+**感谢你的STAR🌟，希望这一切对你有所帮助。**
 
 </div>

{cpolar_connect-0.1.0.dev0 → cpolar_connect-0.1.0.dev1}/README.md

@@ -257,9 +257,6 @@ MIT License - 详见 [LICENSE](LICENSE)
 ---
 
 <div align="center">
-
-**如果觉得有用，请给个 ⭐ Star！**
-
-Made with ❤️ for developers
+**感谢你的STAR🌟，希望这一切对你有所帮助。**
 
 </div>

{cpolar_connect-0.1.0.dev0 → cpolar_connect-0.1.0.dev1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "cpolar-connect"
-version = "0.1.0.dev0"
+version = "0.1.0.dev1"
 description = "Easy-to-use CLI tool for cpolar tunnel management and SSH connections"
 authors = [
     {name = "Hoper_J", email = "hoper.hw@gmail.com"},

{cpolar_connect-0.1.0.dev0 → cpolar_connect-0.1.0.dev1}/src/cpolar_connect/cli.py

@@ -21,7 +21,7 @@ from .i18n import _, get_i18n, Language
 console = Console()
 
 @click.group(invoke_without_command=True)
-@click.version_option(version="0.0.1")
+@click.version_option(version="0.1.0.dev1")
 @click.pass_context
 def cli(ctx):
     """🚀 Cpolar Connect - Easy cpolar tunnel management and SSH connections"""

{cpolar_connect-0.1.0.dev0 → cpolar_connect-0.1.0.dev1}/src/cpolar_connect/i18n.py

@@ -43,6 +43,8 @@ class Messages:
         "ssh.generating_key": "Generating SSH key pair...",
         "ssh.key_exists": "SSH key already exists: {path}",
         "ssh.uploading_key": "Uploading public key to server...",
+        "ssh.need_password_for_key_upload": "Need password to upload SSH key to server",
+        "ssh.trying_connect": "Attempting SSH connection as {username}@{hostname}...",
         "ssh.key_uploaded": "✅ Public key uploaded successfully",
         "ssh.updating_config": "Updating SSH config...",
         "ssh.config_updated": "✅ SSH config updated",
@@ -101,6 +103,9 @@ class Messages:
         "error.ssh_upload_failed": "Failed to upload public key: {error}",
         "error.ssh_connect_failed": "Failed to connect: {error}",
         "error.ssh_auth_failed": "Failed to establish SSH key authentication",
+        "error.ssh_auth_failed_detail": "SSH authentication failed for user '{username}' on {hostname}",
+        "hint.check_username_password": "Please verify: 1) Server username is correct (run 'whoami' on server), 2) Password is correct",
+        "hint.run_doctor": "Run 'cpolar-connect doctor' for diagnostics or 'cpolar-connect config set server.user USERNAME' to fix",
         "error.tunnel_url_invalid": "Invalid tunnel URL format: {url}",
         "error.password_clear_failed": "Failed to clear password: {error}",
         "error.keyring_access_failed": "Failed to access keyring: {error}",
@@ -227,6 +232,8 @@ class Messages:
         "ssh.generating_key": "正在生成 SSH 密钥对...",
         "ssh.key_exists": "SSH 密钥已存在：{path}",
         "ssh.uploading_key": "正在上传公钥到服务器...",
+        "ssh.need_password_for_key_upload": "需要密码来上传 SSH 密钥到服务器",
+        "ssh.trying_connect": "正在尝试以 {username}@{hostname} 进行 SSH 连接...",
         "ssh.key_uploaded": "✅ 公钥上传成功",
         "ssh.updating_config": "正在更新 SSH 配置...",
         "ssh.config_updated": "✅ SSH 配置已更新",
@@ -285,6 +292,9 @@ class Messages:
         "error.ssh_upload_failed": "上传公钥失败：{error}",
         "error.ssh_connect_failed": "连接失败：{error}",
         "error.ssh_auth_failed": "建立 SSH 密钥认证失败",
+        "error.ssh_auth_failed_detail": "SSH 认证失败：用户 '{username}' 在主机 {hostname} 上认证失败",
+        "hint.check_username_password": "请检查：1) 服务器用户名是否正确（在服务器运行 'whoami' 查看），2) 密码是否正确",
+        "hint.run_doctor": "运行 'cpolar-connect doctor' 进行诊断，或使用 'cpolar-connect config set server.user 用户名' 修正",
         "error.tunnel_url_invalid": "无效的隧道 URL 格式：{url}",
         "error.password_clear_failed": "清除密码失败：{error}",
         "error.keyring_access_failed": "访问密钥环失败：{error}",

{cpolar_connect-0.1.0.dev0 → cpolar_connect-0.1.0.dev1}/src/cpolar_connect/ssh.py

@@ -172,6 +172,7 @@ class SSHManager:
         
         # Get password if not provided
         if not password:
+            console.print(f"[yellow]🔑 {_('ssh.need_password_for_key_upload')}[/yellow]")
             password = getpass(f"Enter password for {self.server_user}@{hostname}: ")
         
         ssh = paramiko.SSHClient()
@@ -181,12 +182,15 @@ class SSHManager:
         
         try:
             # Connect with password
+            console.print(f"[dim]{_('ssh.trying_connect', username=self.server_user, hostname=hostname)}[/dim]")
             ssh.connect(
                 hostname=hostname,
                 port=port,
                 username=self.server_user,
                 password=password,
-                timeout=10
+                timeout=30,  # Increase timeout for slow connections
+                allow_agent=False,
+                look_for_keys=False
             )
             
             # Ensure .ssh directory exists
@@ -213,6 +217,13 @@ class SSHManager:
             
             ssh.close()
             
+        except paramiko.AuthenticationException as e:
+            logger.error(f"SSH authentication failed: {e}")
+            error_msg = _('error.ssh_auth_failed_detail', username=self.server_user, hostname=hostname)
+            console.print(f"[red]❌ {error_msg}[/red]")
+            console.print(f"[yellow]💡 {_('hint.check_username_password')}[/yellow]")
+            console.print(f"[yellow]💡 {_('hint.run_doctor')}[/yellow]")
+            raise SSHError(error_msg)
         except Exception as e:
             logger.error(f"Failed to upload public key: {e}")
             raise SSHError(_('error.ssh_upload_failed', error=e))