Merge pull request #272 from qinfendebingshuo/copilot/troubleshoot-vpn-deployment-issues

fix(proxy): Fix deploy-proxy.sh PM2 service management and suppress spurious ufw warnings

server/proxy/deploy-proxy.sh

@@ -223,7 +223,8 @@ configure_nginx() {
     fi
 }
 
-# ── 启动PM2服务 ───────────────────────────────
+# ── 启动/重启PM2服务 ──────────────────────────
+# 使用 pm2 startOrRestart 统一处理（已注册→重启，未注册→启动）
 start_pm2_services() {
     cd "$PROXY_DIR" || { echo "❌ 无法进入 $PROXY_DIR"; return 1; }
 
@@ -235,9 +236,9 @@ start_pm2_services() {
         set +a
     fi
 
-    pm2 start ecosystem.proxy.config.js
+    pm2 startOrRestart ecosystem.proxy.config.js --update-env
     pm2 save
-    echo "✅ PM2代理服务已启动"
+    echo "✅ PM2代理服务已就绪"
     pm2 list
 }
 
@@ -290,7 +291,10 @@ update() {
     ensure_log_permissions
 
     # 关闭3802外部端口 (订阅服务改为通过Nginx反代访问)
-    ufw delete allow 3802/tcp 2>/dev/null || true
+    if ufw status | grep -q "3802/tcp" 2>/dev/null; then
+        ufw delete allow 3802/tcp || true
+        echo "  ✅ 已移除3802端口外部访问规则"
+    fi
 
     # 检查并修复443端口冲突
     # 如果Nginx占用了443端口(旧SSL配置)，需要移除以让Xray接管
@@ -313,19 +317,8 @@ update() {
 
     systemctl restart xray
 
-    # 检查PM2中是否已注册代理服务进程
-    # 如果不存在则使用 ecosystem config 启动（而非仅 restart）
-    if pm2 describe zy-proxy-sub >/dev/null 2>&1 && \
-       pm2 describe zy-proxy-monitor >/dev/null 2>&1 && \
-       pm2 describe zy-proxy-guardian >/dev/null 2>&1; then
-        echo "  PM2代理服务已存在，执行重启..."
-        pm2 restart zy-proxy-sub zy-proxy-monitor zy-proxy-guardian
-    else
-        echo "  ⚠️ PM2代理服务未完整注册，执行启动..."
-        # 先删除可能存在的部分注册进程，然后重新启动全部
-        pm2 delete zy-proxy-sub zy-proxy-monitor zy-proxy-guardian 2>/dev/null || true
-        start_pm2_services
-    fi
+    # PM2代理服务
+    start_pm2_services
 
     health_check
     echo "✅ 更新完成"
@@ -340,16 +333,8 @@ status() {
 restart() {
     echo "重启所有代理服务..."
     systemctl restart xray
-    # 检查PM2中是否已注册所有代理服务进程
-    if pm2 describe zy-proxy-sub >/dev/null 2>&1 && \
-       pm2 describe zy-proxy-monitor >/dev/null 2>&1 && \
-       pm2 describe zy-proxy-guardian >/dev/null 2>&1; then
-        pm2 restart zy-proxy-sub zy-proxy-monitor zy-proxy-guardian
-    else
-        echo "  ⚠️ PM2代理服务未完整注册，执行启动..."
-        pm2 delete zy-proxy-sub zy-proxy-monitor zy-proxy-guardian 2>/dev/null || true
-        start_pm2_services
-    fi
+    # PM2代理服务
+    start_pm2_services
     sleep 3
     health_check
 }

server/proxy/ecosystem.proxy.config.js

@@ -7,6 +7,7 @@ module.exports = {
   apps: [
     {
       name: 'zy-proxy-sub',
+      version: '1.0.0',
       script: '/opt/zhuyuan/proxy/service/subscription-server.js',
       instances: 1,
       env: {
@@ -22,6 +23,7 @@ module.exports = {
     },
     {
       name: 'zy-proxy-monitor',
+      version: '1.0.0',
       script: '/opt/zhuyuan/proxy/service/traffic-monitor.js',
       instances: 1,
       env: {
@@ -35,6 +37,7 @@ module.exports = {
     },
     {
       name: 'zy-proxy-guardian',
+      version: '1.0.0',
       script: '/opt/zhuyuan/proxy/service/proxy-guardian.js',
       instances: 1,
       env: {