@chenpu17/tcpmapping 2.0.0 → 2.1.0

package/public/login.html

@@ -14,19 +14,32 @@
         body {
             font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
             background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-            height: 100vh;
+            min-height: 100vh;
             display: flex;
             align-items: center;
             justify-content: center;
+            padding: 1rem;
         }
 
         .login-container {
             background: white;
-            padding: 2rem;
-            border-radius: 10px;
-            box-shadow: 0 15px 35px rgba(0, 0, 0, 0.1);
+            padding: 2.5rem;
+            border-radius: 20px;
+            box-shadow: 0 25px 50px rgba(0, 0, 0, 0.25);
             width: 100%;
-            max-width: 400px;
+            max-width: 420px;
+            animation: slideUp 0.5s ease;
+        }
+
+        @keyframes slideUp {
+            from {
+                opacity: 0;
+                transform: translateY(30px);
+            }
+            to {
+                opacity: 1;
+                transform: translateY(0);
+            }
         }
 
         .login-header {
@@ -34,14 +47,33 @@
             margin-bottom: 2rem;
         }
 
+        .login-header .logo {
+            width: 70px;
+            height: 70px;
+            background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+            border-radius: 20px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            margin: 0 auto 1.5rem;
+            box-shadow: 0 10px 30px rgba(102, 126, 234, 0.4);
+        }
+
+        .login-header .logo svg {
+            width: 36px;
+            height: 36px;
+            color: white;
+        }
+
         .login-header h1 {
-            color: #333;
+            color: #2d3436;
             font-size: 24px;
+            font-weight: 700;
             margin-bottom: 0.5rem;
         }
 
         .login-header p {
-            color: #666;
+            color: #636e72;
             font-size: 14px;
         }
 
@@ -52,125 +84,176 @@
         .form-group label {
             display: block;
             margin-bottom: 0.5rem;
-            color: #333;
-            font-weight: 500;
+            color: #2d3436;
+            font-weight: 600;
+            font-size: 14px;
         }
 
         .form-group input {
             width: 100%;
-            padding: 0.75rem;
-            border: 1px solid #ddd;
-            border-radius: 5px;
-            font-size: 16px;
-            transition: border-color 0.3s;
+            padding: 0.9rem 1rem;
+            border: 2px solid #e9ecef;
+            border-radius: 12px;
+            font-size: 15px;
+            transition: all 0.3s ease;
         }
 
         .form-group input:focus {
             outline: none;
             border-color: #667eea;
-            box-shadow: 0 0 0 3px rgba(102, 126, 234, 0.1);
+            box-shadow: 0 0 0 4px rgba(102, 126, 234, 0.15);
+        }
+
+        .form-group input::placeholder {
+            color: #b2bec3;
         }
 
         .login-btn {
             width: 100%;
-            padding: 0.75rem;
+            padding: 0.95rem;
             background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
             color: white;
             border: none;
-            border-radius: 5px;
+            border-radius: 12px;
             font-size: 16px;
             font-weight: 600;
             cursor: pointer;
-            transition: transform 0.2s;
+            transition: all 0.3s ease;
+            box-shadow: 0 10px 30px rgba(102, 126, 234, 0.4);
         }
 
         .login-btn:hover {
-            transform: translateY(-2px);
+            transform: translateY(-3px);
+            box-shadow: 0 15px 35px rgba(102, 126, 234, 0.5);
+        }
+
+        .login-btn:active {
+            transform: translateY(-1px);
         }
 
         .login-btn:disabled {
-            opacity: 0.6;
+            opacity: 0.7;
             cursor: not-allowed;
             transform: none;
+            box-shadow: none;
         }
 
         .error-message {
-            color: #e74c3c;
+            color: #ee5a5a;
             font-size: 14px;
-            margin-top: 0.5rem;
+            margin-top: 1rem;
+            padding: 0.85rem 1rem;
+            background: #fff5f5;
+            border-radius: 10px;
             display: none;
+            text-align: center;
         }
 
         .success-message {
-            color: #27ae60;
+            color: #2ed573;
             font-size: 14px;
-            margin-top: 0.5rem;
+            margin-top: 1rem;
+            padding: 0.85rem 1rem;
+            background: #f0fff4;
+            border-radius: 10px;
             display: none;
+            text-align: center;
+        }
+
+        .help-info {
+            background: linear-gradient(135deg, #f8f9fa 0%, #f1f3f4 100%);
+            border-radius: 12px;
+            padding: 1rem 1.25rem;
+            margin-top: 1.5rem;
+            font-size: 13px;
+            color: #636e72;
+            line-height: 1.6;
         }
 
-        .default-info {
-            background: #f8f9fa;
-            border: 1px solid #e9ecef;
+        .help-info code {
+            background: #e9ecef;
+            padding: 0.2rem 0.5rem;
             border-radius: 5px;
-            padding: 1rem;
-            margin-top: 1rem;
-            font-size: 14px;
-            color: #666;
+            font-family: 'SFMono-Regular', Consolas, monospace;
+            font-size: 12px;
+            color: #764ba2;
         }
 
-        .default-info strong {
-            color: #333;
+        .footer {
+            text-align: center;
+            margin-top: 2rem;
+            color: rgba(255,255,255,0.7);
+            font-size: 13px;
+        }
+
+        .footer a {
+            color: rgba(255,255,255,0.9);
+            text-decoration: none;
+        }
+
+        .footer a:hover {
+            text-decoration: underline;
         }
     </style>
 </head>
 <body>
-    <div class="login-container">
-        <div class="login-header">
-            <h1>TCP转发服务器</h1>
-            <p>管理界面登录</p>
-        </div>
-        
-        <form id="loginForm">
-            <div class="form-group">
-                <label for="username">用户名</label>
-                <input type="text" id="username" name="username" required>
+    <div>
+        <div class="login-container">
+            <div class="login-header">
+                <div class="logo">
+                    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+                        <path d="M22 12h-4l-3 9L9 3l-3 9H2"/>
+                    </svg>
+                </div>
+                <h1>TCP转发服务器</h1>
+                <p>管理界面登录</p>
             </div>
-            
-            <div class="form-group">
-                <label for="password">密码</label>
-                <input type="password" id="password" name="password" required>
+
+            <form id="loginForm">
+                <div class="form-group">
+                    <label for="username">用户名</label>
+                    <input type="text" id="username" name="username" placeholder="请输入用户名" required autocomplete="username">
+                </div>
+
+                <div class="form-group">
+                    <label for="password">密码</label>
+                    <input type="password" id="password" name="password" placeholder="请输入密码" required autocomplete="current-password">
+                </div>
+
+                <button type="submit" class="login-btn" id="loginBtn">登录</button>
+
+                <div class="error-message" id="errorMessage"></div>
+                <div class="success-message" id="successMessage"></div>
+            </form>
+
+            <div class="help-info">
+                忘记密码？运行 <code>tcpmapping setup-password</code> 或 <code>npm run reset-password</code> 重置
             </div>
-            
-            <button type="submit" class="login-btn" id="loginBtn">登录</button>
-            
-            <div class="error-message" id="errorMessage"></div>
-            <div class="success-message" id="successMessage"></div>
-        </form>
-        
-        <div class="default-info">
-            <strong>提示：</strong><br>
-            如忘记密码，请运行 <code>npm run reset-password</code> 重置
+        </div>
+
+        <div class="footer">
+            <a href="https://github.com/chenpu17/TcpMapping" target="_blank">TcpMapping</a> - TCP端口转发服务器
         </div>
     </div>
 
     <script>
         document.getElementById('loginForm').addEventListener('submit', async (e) => {
             e.preventDefault();
-            
+
             const loginBtn = document.getElementById('loginBtn');
             const errorMessage = document.getElementById('errorMessage');
             const successMessage = document.getElementById('successMessage');
             const username = document.getElementById('username').value;
             const password = document.getElementById('password').value;
-            
+
             // 重置消息
             errorMessage.style.display = 'none';
             successMessage.style.display = 'none';
-            
+
             // 禁用按钮
             loginBtn.disabled = true;
             loginBtn.textContent = '登录中...';
-            
+
             try {
                 const response = await fetch('/api/login', {
                     method: 'POST',
@@ -179,16 +262,16 @@
                     },
                     body: JSON.stringify({ username, password })
                 });
-                
+
                 const data = await response.json();
-                
+
                 if (data.success) {
-                    successMessage.textContent = data.message;
+                    successMessage.textContent = '登录成功，正在跳转...';
                     successMessage.style.display = 'block';
-                    
+
                     setTimeout(() => {
                         window.location.href = '/dashboard';
-                    }, 1000);
+                    }, 800);
                 } else {
                     errorMessage.textContent = data.message;
                     errorMessage.style.display = 'block';
@@ -202,6 +285,13 @@
                 loginBtn.textContent = '登录';
             }
         });
+
+        // 回车提交
+        document.addEventListener('keypress', (e) => {
+            if (e.key === 'Enter') {
+                document.getElementById('loginForm').dispatchEvent(new Event('submit'));
+            }
+        });
     </script>
 </body>
-</html>
+</html>

package/server.js

@@ -1,11 +1,59 @@
 const net = require('net');
 const fs = require('fs');
 const path = require('path');
+const os = require('os');
 const express = require('express');
 const session = require('express-session');
 const bcrypt = require('bcryptjs');
 const bodyParser = require('body-parser');
 
+// 数据目录 - 用于存储用户配置（持久化）
+const DATA_DIR = path.join(os.homedir(), '.tcpmapping');
+
+// 获取配置文件路径（按优先级搜索）
+function getConfigPath(filename) {
+  // 优先级1: 当前工作目录
+  const cwdPath = path.join(process.cwd(), filename);
+  if (fs.existsSync(cwdPath)) {
+    return cwdPath;
+  }
+
+  // 优先级2: 用户数据目录 (~/.tcpmapping/)
+  const dataPath = path.join(DATA_DIR, filename);
+  if (fs.existsSync(dataPath)) {
+    return dataPath;
+  }
+
+  // 优先级3: 包安装目录（仅作为模板）
+  const pkgPath = path.join(__dirname, filename);
+  if (fs.existsSync(pkgPath)) {
+    return pkgPath;
+  }
+
+  return null;
+}
+
+// 获取配置保存路径
+function getConfigSavePath(filename) {
+  // 如果当前工作目录有配置文件，保存到当前目录
+  const cwdPath = path.join(process.cwd(), filename);
+  if (fs.existsSync(cwdPath)) {
+    return cwdPath;
+  }
+
+  // 否则保存到用户数据目录
+  ensureDataDir();
+  return path.join(DATA_DIR, filename);
+}
+
+// 确保数据目录存在
+function ensureDataDir() {
+  if (!fs.existsSync(DATA_DIR)) {
+    fs.mkdirSync(DATA_DIR, { recursive: true });
+    console.log(`创建配置目录: ${DATA_DIR}`);
+  }
+}
+
 // 全局变量
 let config = {};
 const servers = new Map(); // 存储所有TCP转发服务器实例
@@ -21,12 +69,16 @@ const loginAttempts = new Map();
 // 加载认证配置
 function loadAuthConfig() {
   try {
-    const authConfigPath = path.join(__dirname, 'auth-config.json');
+    const authConfigPath = getConfigPath('auth-config.json');
+    if (!authConfigPath) {
+      throw new Error('认证配置文件不存在');
+    }
     const authConfigData = fs.readFileSync(authConfigPath, 'utf8');
+    console.log(`加载认证配置: ${authConfigPath}`);
     return JSON.parse(authConfigData);
   } catch (error) {
     console.error('警告: 未找到认证配置文件，使用默认配置');
-    console.error('请运行 "node setup-password.js" 来设置安全密码');
+    console.error('请运行 "tcpmapping setup-password" 或 "npm run setup-password" 来设置安全密码');
     
     // 返回默认配置（仅用于向后兼容）
     return {
@@ -125,15 +177,21 @@ const LOG_LEVELS = {
 // 读取配置文件
 function loadConfig() {
   try {
-    const configPath = path.join(__dirname, 'config.json');
+    const configPath = getConfigPath('config.json');
+    if (!configPath) {
+      console.log('未找到配置文件，使用默认配置');
+      console.log('运行 "tcpmapping init" 创建配置文件');
+      return getDefaultConfig();
+    }
     const configData = fs.readFileSync(configPath, 'utf8');
     const loadedConfig = JSON.parse(configData);
-    
+    console.log(`加载配置文件: ${configPath}`);
+
     // 验证配置
     if (!loadedConfig.mappings || !Array.isArray(loadedConfig.mappings)) {
       loadedConfig.mappings = [];
     }
-    
+
     // 添加默认WebUI配置
     if (!loadedConfig.webui) {
       loadedConfig.webui = {
@@ -142,32 +200,37 @@ function loadConfig() {
         host: '0.0.0.0'
       };
     }
-    
+
     return loadedConfig;
   } catch (error) {
     console.error('读取配置文件失败:', error.message);
-    // 返回默认配置
-    return {
-      mappings: [],
-      webui: {
-        enabled: true,
-        port: 9999,
-        host: '0.0.0.0'
-      },
-      logging: {
-        enabled: true,
-        level: 'info'
-      }
-    };
+    return getDefaultConfig();
   }
 }
 
+// 获取默认配置
+function getDefaultConfig() {
+  return {
+    mappings: [],
+    webui: {
+      enabled: true,
+      port: 9999,
+      host: '0.0.0.0'
+    },
+    logging: {
+      enabled: true,
+      level: 'info'
+    }
+  };
+}
+
 // 保存配置文件
 function saveConfig(newConfig) {
   try {
-    const configPath = path.join(__dirname, 'config.json');
+    const configPath = getConfigSavePath('config.json');
     fs.writeFileSync(configPath, JSON.stringify(newConfig, null, 2));
     config = newConfig;
+    console.log(`配置已保存: ${configPath}`);
     return true;
   } catch (error) {
     console.error('保存配置文件失败:', error.message);

package/setup-password.js

@@ -1,8 +1,19 @@
 const fs = require('fs');
 const path = require('path');
+const os = require('os');
 const bcrypt = require('bcryptjs');
 const readline = require('readline');
 
+// 获取配置保存目录
+function getConfigDir() {
+  // 优先使用环境变量指定的目录
+  if (process.env.TCPMAPPING_DATA_DIR) {
+    return process.env.TCPMAPPING_DATA_DIR;
+  }
+  // 其次使用当前工作目录
+  return process.cwd();
+}
+
 // 创建readline接口
 const rl = readline.createInterface({
   input: process.stdin,
@@ -81,7 +92,7 @@ function getPassword(prompt) {
 // 读取现有的认证配置
 function loadAuthConfig() {
   try {
-    const configPath = path.join(__dirname, 'auth-config.json');
+    const configPath = path.join(getConfigDir(), 'auth-config.json');
     const configData = fs.readFileSync(configPath, 'utf8');
     return JSON.parse(configData);
   } catch (error) {
@@ -107,8 +118,14 @@ function loadAuthConfig() {
 
 // 保存认证配置
 function saveAuthConfig(config) {
-  const configPath = path.join(__dirname, 'auth-config.json');
+  const configDir = getConfigDir();
+  // 确保目录存在
+  if (!fs.existsSync(configDir)) {
+    fs.mkdirSync(configDir, { recursive: true });
+  }
+  const configPath = path.join(configDir, 'auth-config.json');
   fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
+  console.log(`配置已保存到: ${configPath}`);
 }
 
 // 主要设置流程

package/config.json

@@ -1,46 +0,0 @@
-{
-  "mappings": [
-    {
-      "name": "Dify",
-      "listen": {
-        "host": "0.0.0.0",
-        "port": 5588
-      },
-      "target": {
-        "host": "113.45.34.202",
-        "port": 5588
-      }
-    },
-    {
-      "name": "语音助手",
-      "listen": {
-        "host": "0.0.0.0",
-        "port": 3443
-      },
-      "target": {
-        "host": "115.120.49.208",
-        "port": 443
-      }
-    },
-    {
-      "name": "语音助手",
-      "listen": {
-        "host": "0.0.0.0",
-        "port": 443
-      },
-      "target": {
-        "host": "115.120.49.208",
-        "port": 443
-      }
-    }
-  ],
-  "webui": {
-    "enabled": true,
-    "port": 9999,
-    "host": "0.0.0.0"
-  },
-  "logging": {
-    "enabled": true,
-    "level": "info"
-  }
-}