Update sync_data.sh

sync_data.sh

@@ -12,14 +12,12 @@ mkdir -p "$WORK_DIR"
 
 # 从 WebDAV 恢复配置的函数
 restore_from_webdav() {
-
-
-
-
-
     echo "正在从 WebDAV 恢复配置文件..."
     
     # 创建临时恢复目录
+    RESTORE_DIR="$WORK_DIR/webdav_restore"
+    mkdir -p "$RESTORE_DIR"
+    
     # 获取WebDAV上所有备份文件列表
     echo "获取 WebDAV 备份文件列表..."
     
@@ -27,118 +25,118 @@ restore_from_webdav() {
     RAW_RESPONSE=$(curl -s -X PROPFIND \
         --user "$WEBDAV_USERNAME:$WEBDAV_PASSWORD" \
         -H "Depth: 1" \
+        -H "Content-Type: text/xml" \
+        -d '<?xml version="1.0" encoding="utf-8"?><propfind xmlns="DAV:"><prop><displayname/></prop></propfind>' \
+        "$WEBDAV_URL/")
+    
+    # 如果PROPFIND失败，尝试简单的GET请求
+    if [ -z "$RAW_RESPONSE" ] || echo "$RAW_RESPONSE" | grep -q "Method Not Allowed"; then
+        RAW_RESPONSE=$(curl -s --user "$WEBDAV_USERNAME:$WEBDAV_PASSWORD" "$WEBDAV_URL/")
     fi
     
     # 多种匹配方式
-
     BACKUP_LIST1=$(echo "$RAW_RESPONSE" | grep -oE '<D:displayname[^>]*>[^<]*mcp_backup_[0-9]+_[0-9]+\.tar\.gz[^<]*</D:displayname>' | sed 's/<[^>]*>//g')
-
-
     BACKUP_LIST2=$(echo "$RAW_RESPONSE" | grep -oE 'href="[^"]*mcp_backup_[0-9]+_[0-9]+\.tar\.gz[^"]*"' | sed 's/.*href="[^"]*\///g' | sed 's/".*//g')
-
-
     BACKUP_LIST3=$(echo "$RAW_RESPONSE" | grep -oE 'mcp_backup_[0-9]+_[0-9]+\.tar\.gz')
     
     # 合并所有结果
+    BACKUP_LIST=$(printf "%s\n%s\n%s\n" "$BACKUP_LIST1" "$BACKUP_LIST2" "$BACKUP_LIST3" | grep -v '^$' | sort -u | sort -r)
+    
+    if [ -z "$BACKUP_LIST" ]; then
+        echo "未找到任何备份文件"
+        rm -rf "$RESTORE_DIR"
+        return 1
+    fi
+    
+    echo "找到以下备份文件："
+    echo "$BACKUP_LIST" | head -5 | while read file; do echo "  - $file"; done
+    if [ $(echo "$BACKUP_LIST" | wc -l) -gt 5 ]; then
+        echo "  ... 等共 $(echo "$BACKUP_LIST" | wc -l) 个文件"
+    fi
+    
+    # 尝试下载最新的备份文件
+    LATEST_BACKUP=$(echo "$BACKUP_LIST" | head -1)
+    echo "尝试下载最新备份: $LATEST_BACKUP"
+    
+    if curl -f --user "$WEBDAV_USERNAME:$WEBDAV_PASSWORD" "$WEBDAV_URL/$LATEST_BACKUP" -o "$RESTORE_DIR/$LATEST_BACKUP" 2>/dev/null; then
+        echo "下载备份成功: $LATEST_BACKUP"
+        
+        # 解压缩备份文件
+        cd "$RESTORE_DIR"
+        tar -xzf "$LATEST_BACKUP" && {
+            echo "解压缩备份文件成功"
+            
+            # 恢复配置文件
+            if [ -d "config" ] && [ "$(ls -A config 2>/dev/null)" ]; then
+                echo "恢复 config 目录..."
+                mkdir -p /mcp-proxy-server/config
+                cp -r config/* /mcp-proxy-server/config/
+                echo "config 目录恢复成功"
+            else
+                echo "备份中没有 config 目录或目录为空"
+            fi
+            
+            if [ -d "tools" ] && [ "$(ls -A tools 2>/dev/null)" ]; then
+                echo "恢复 tools 目录..."
+                mkdir -p /tools
+                cp -r tools/* /tools/
+                echo "tools 目录恢复成功"
+            else
+                echo "备份中没有 tools 目录或目录为空"
+            fi
+            
+            echo "从 WebDAV 恢复配置文件完成"
+        } || {
+            echo "解压缩备份文件失败"
+        }
+        cd - > /dev/null
+    else
+        echo "下载最新备份失败，尝试其他备份文件..."
+        
+        # 尝试前3个备份文件
+        SUCCESS=0
+        for backup_file in $(echo "$BACKUP_LIST" | head -3 | tail -n +2); do
+            echo "尝试下载: $backup_file"
+            if curl -f --user "$WEBDAV_USERNAME:$WEBDAV_PASSWORD" "$WEBDAV_URL/$backup_file" -o "$RESTORE_DIR/$backup_file" 2>/dev/null; then
+                echo "下载成功，开始解压..."
+                cd "$RESTORE_DIR"
+                if tar -xzf "$backup_file"; then
+                    echo "解压成功，恢复文件..."
+                    
+                    # 恢复配置文件
+                    if [ -d "config" ] && [ "$(ls -A config 2>/dev/null)" ]; then
+                        mkdir -p /mcp-proxy-server/config
+                        cp -r config/* /mcp-proxy-server/config/
+                        echo "config 目录恢复成功"
+                    fi
+                    
+                    if [ -d "tools" ] && [ "$(ls -A tools 2>/dev/null)" ]; then
+                        mkdir -p /tools
+                        cp -r tools/* /tools/
+                        echo "tools 目录恢复成功"
+                    fi
+                    
+                    SUCCESS=1
+                    break
+                fi
+                cd - > /dev/null
+            fi
+        done
+        
+        if [ "$SUCCESS" = "0" ]; then
+            echo "无法下载任何可用的备份文件"
+        fi
+    fi
+    
+    # 清理临时目录
+    rm -rf "$RESTORE_DIR"
     return 0
 }
 
 # 处理恢复参数
 if [ "$1" = "--restore-only" ] && [ "$2" = "webdav" ]; then
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     restore_from_webdav
     exit 0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 fi
 
 # 启动时自动从WebDAV恢复
@@ -158,32 +156,10 @@ sync_data() {
     
     while true; do
         echo "正在开始同步检查"
-
-
-
-
-
-
-
-
-
-
-
-
         
         # 检查config和tools目录变化
         CONFIG_CHANGED=0
         TOOLS_CHANGED=0
-
-
-
-
-
-
-
-
-
-
         
         # 检查config目录变化
         if [ -d "/mcp-proxy-server/config" ] && [ "$(ls -A /mcp-proxy-server/config 2>/dev/null)" ]; then
@@ -193,15 +169,10 @@ sync_data() {
             
             # 获取上次记录的时间
             LAST_CONFIG_TIME=$(cat "$CONFIG_LAST_CHECK_FILE" 2>/dev/null || echo 0)
-
-
             
             if [ "$CURRENT_CONFIG_TIME" -gt "$LAST_CONFIG_TIME" ]; then
                 CONFIG_CHANGED=1
                 echo "检测到 config 目录变化"
-
-
-
             fi
         fi
         
@@ -217,12 +188,6 @@ sync_data() {
             if [ "$CURRENT_TOOLS_TIME" -gt "$LAST_TOOLS_TIME" ]; then
                 TOOLS_CHANGED=1
                 echo "检测到 tools 目录变化"
-
-
-
-
-
-
             fi
         fi
         
@@ -232,21 +197,6 @@ sync_data() {
             
             # 使用时间戳创建备份文件名
             FILENAME="mcp_backup_$(date +'%Y%m%d_%H%M').tar.gz"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
             
             # 创建临时备份压缩包
             TEMP_DIR="$WORK_DIR/temp_backup"
@@ -255,14 +205,6 @@ sync_data() {
             
             # 复制要备份的目录到临时目录
             BACKUP_CREATED=0
-
-
-
-
-
-
-
-
             
             # 备份config目录（排除工作目录）
             if [ -d "/mcp-proxy-server/config" ] && [ "$(ls -A /mcp-proxy-server/config 2>/dev/null)" ]; then
@@ -270,6 +212,8 @@ sync_data() {
                 for item in /mcp-proxy-server/config/*; do
                     if [ -e "$item" ]; then
                         BASENAME=$(basename "$item")
+                        case "$BASENAME" in
+                            github_data|temp_backup|webdav_restore)
                                 ;;
                             *)
                                 if [ -d "$item" ]; then
@@ -282,16 +226,6 @@ sync_data() {
                     fi
                 done
             fi
-
-
-
-
-
-
-
-
-
-
             
             # 备份tools目录
             if [ -d "/tools" ] && [ "$(ls -A /tools 2>/dev/null)" ]; then
@@ -308,163 +242,22 @@ sync_data() {
                                 touch "$TEMP_DIR/tools/$BASENAME/.gitkeep"
                                 BACKUP_CREATED=1
                             fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
                         else
                             cp "$item" "$TEMP_DIR/tools/" 2>/dev/null && BACKUP_CREATED=1
-
-
                         fi
-
-
-
-
-
-
-
                     fi
                 done
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
             fi
             
             # 创建压缩包并上传
             if [ "$BACKUP_CREATED" = "1" ] && [ "$(ls -A $TEMP_DIR)" ]; then
                 (cd "$TEMP_DIR" && tar -czf "../$FILENAME" .)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
                 
                 if curl -T "$WORK_DIR/$FILENAME" --user "$WEBDAV_USERNAME:$WEBDAV_PASSWORD" "$WEBDAV_URL/$FILENAME" >/dev/null 2>&1; then
                     echo "WebDAV备份上传成功: $FILENAME"
                     # 更新记录文件
                     [ "$CONFIG_CHANGED" = "1" ] && echo "$CURRENT_CONFIG_TIME" > "$CONFIG_LAST_CHECK_FILE"
                     [ "$TOOLS_CHANGED" = "1" ] && echo "$CURRENT_TOOLS_TIME" > "$TOOLS_LAST_CHECK_FILE"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
                 else
                     echo "WebDAV备份上传失败"
                 fi
@@ -474,18 +267,42 @@ sync_data() {
             fi
             
             rm -rf "$TEMP_DIR"
-
         else
             echo "无文件变化，跳过备份"
         fi
         
         # 等待下一次检查
-
-
-
         SYNC_INTERVAL=${SYNC_INTERVAL:-7200}  # 默认间隔时间为 7200 秒
         echo "等待 ${SYNC_INTERVAL} 秒后进行下一次检查..."
         sleep $SYNC_INTERVAL
-
     done
-}
+}
+
+# 后台启动同步进程
+sync_data &
+
+echo "同步进程已在后台启动 (PID: $!)"
+echo "现在启动 MCP Proxy 主程序..."
+
+# 启动原始的 MCP Proxy 程序
+echo "准备启动 MCP Proxy，端口: ${PORT:-7860}，主机: ${HOST:-0.0.0.0}"
+
+if [ -f build/sse.js ]; then
+    echo "启动: node build/sse.js"
+    PORT=${PORT:-7860} HOST=${HOST:-0.0.0.0} exec node build/sse.js
+elif [ -f /app/build/sse.js ]; then
+    echo "启动: node /app/build/sse.js"
+    PORT=${PORT:-7860} HOST=${HOST:-0.0.0.0} exec node /app/build/sse.js
+elif [ -f /mcp-proxy-server/build/sse.js ]; then
+    echo "启动: node /mcp-proxy-server/build/sse.js"  
+    PORT=${PORT:-7860} HOST=${HOST:-0.0.0.0} exec node /mcp-proxy-server/build/sse.js
+else
+    echo "错误: 找不到 build/sse.js 文件"
+    echo "当前目录: $(pwd)"
+    echo "查找可能的 Node.js 文件:"
+    find / -name "sse.js" -type f 2>/dev/null | head -5
+    
+    # 如果找不到，保持容器运行以便调试
+    echo "保持容器运行以便调试..."
+    tail -f /dev/null
+fi