Update remote_uploader.py

remote_uploader.py

@@ -1,97 +1,122 @@
-import asyncio
-import websockets
+import requests
+import argparse
 import os
 import time
-import base64
-import logging
-import argparse
-import json
-import urllib.parse
-
-# Configure logging
-logging.basicConfig(level=logging.DEBUG, format='%(asctime)s - %(levelname)s - %(message)s')
-logger = logging.getLogger(__name__)
-
-async def upload_directory(space_id, api_key, upload_dir):
-    # 使用查询参数传递 api_key
-    encoded_secret = urllib.parse.quote(api_key)
-    uri = f"wss://remote-terminal-worker.nianxi4563.workers.dev/terminal/{space_id}?secret={encoded_secret}"
-    logger.info(f"Attempting to connect to {uri}")
-
-    try:
-        async with websockets.connect(uri, ping_interval=20, ping_timeout=60) as websocket:
-            logger.info("Connected to WebSocket")
-
-            # 发送机器注册信息（尽管去除 machine_id，但保持兼容）
-            machine_info = {"type": "machine", "card_id": space_id}
-            await websocket.send(json.dumps(machine_info))
-            logger.debug(f"Sent machine registration: {machine_info}")
 
-            # 不等待 machine_id，直接继续
-
-            # 获取所有文件
-            all_files = []
-            for root, dirs, files in os.walk(upload_dir):
-                for file in files:
-                    file_path = os.path.join(root, file)
-                    if os.path.isfile(file_path):
-                        all_files.append(file_path)
-
-            if not all_files:
-                logger.info("No files found in directory")
-                return 0, 0
-
-            logger.info(f"Found {len(all_files)} files, starting upload...")
-
-            success_count = 0
-            failed_count = 0
-
-            for file_path in all_files:
+class FileUploader:
+    def __init__(self, api_key, space_id):
+        self.server_url = "https://gkbtyo-rqvays-5001.preview.cloudstudio.work"
+        self.api_key = api_key
+        self.space_id = space_id
+        
+    def upload_file(self, file_path):
+        """上传单个文件"""
+        if not os.path.exists(file_path):
+            print(f"文件不存在: {file_path}")
+            return False
+        
+        filename = os.path.basename(file_path)
+        print(f"正在上传文件: {filename}")
+        
+        # 构建完整的 API 端点 URL
+        upload_url = f"{self.server_url.rstrip('/')}/api/remote_upload"
+        
+        # 准备请求头和数据
+        headers = {
+            'X-API-Key': self.api_key
+        }
+        data = {
+            'space_id': self.space_id
+        }
+        
+        # 读取文件内容并上传
+        try:
+            with open(file_path, 'rb') as f:
+                files = {
+                    'file': (filename, f)
+                }
+                
+                # 发送 POST 请求
+                response = requests.post(upload_url, headers=headers, data=data, files=files)
+                
+                # 打印服务器响应
+                print(f"服务器响应 ({response.status_code}):")
                 try:
-                    with open(file_path, 'rb') as f:
-                        file_content = f.read()
-                    file_b64 = base64.b64encode(file_content).decode('utf-8')
-                    file_msg = {
-                        "type": "file_upload",
-                        "filename": os.path.basename(file_path),
-                        "content": file_b64
-                    }
-                    await websocket.send(json.dumps(file_msg))
-                    logger.info(f"Uploaded file: {file_path}")
-                    success_count += 1
-                except Exception as e:
-                    logger.error(f"Error uploading file {file_path}: {e}")
-                    failed_count += 1
-                # 稍微延迟，避免服务器压力过大
-                await asyncio.sleep(0.5)
-
-            logger.info(f"Upload completed! Success: {success_count}, Failed: {failed_count}")
-            return success_count, failed_count
-
-    except Exception as e:
-        logger.error(f"Failed to connect or upload: {e}")
-        return 0, len(os.listdir(upload_dir)) if os.path.exists(upload_dir) else 0
+                    result = response.json()
+                    print(result)
+                    if response.status_code == 200:
+                        print(f"✅ 文件 '{filename}' 上传成功!")
+                        return True
+                    else:
+                        print(f"❌ 上传失败: {result.get('error', '未知错误')}")
+                        return False
+                except requests.exceptions.JSONDecodeError:
+                    print(response.text)
+                    return False
+                    
+        except IOError as e:
+            print(f"读取文件时出错: {e}")
+            return False
+        except requests.exceptions.RequestException as e:
+            print(f"请求时出错: {e}")
+            return False
+
+def upload_directory_once(upload_dir, api_key, space_id):
+    """一次性扫描并上传目录中的所有文件"""
+    if not os.path.exists(upload_dir):
+        print(f"目录不存在: {upload_dir}")
+        return
+    
+    print(f"🔍 开始扫描目录: {upload_dir}")
+    print(f"🔑 Space ID: {space_id}")
+    print("-" * 50)
+    
+    uploader = FileUploader(api_key, space_id)
+    
+    # 获取所有文件
+    all_files = []
+    for root, dirs, files in os.walk(upload_dir):
+        for file in files:
+            file_path = os.path.join(root, file)
+            if os.path.isfile(file_path):
+                all_files.append(file_path)
+    
+    if not all_files:
+        print("📁 目录中没有找到任何文件")
+        return
+    
+    print(f"📁 找到 {len(all_files)} 个文件，开始上传...")
+    
+    success_count = 0
+    failed_count = 0
+    
+    for file_path in all_files:
+        try:
+            if uploader.upload_file(file_path):
+                success_count += 1
+            else:
+                failed_count += 1
+            # 稍微延迟一下，避免服务器压力过大
+            time.sleep(0.5)
+        except Exception as e:
+            print(f"上传文件 {file_path} 时发生异常: {e}")
+            failed_count += 1
+    
+    print("-" * 50)
+    print(f"📊 上传完成! 成功: {success_count}, 失败: {failed_count}")
+    
+    if success_count > 0:
+        print("🎉 文件已成功上传到您的网盘!")
+    
+    return success_count, failed_count
 
 if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description="一次性文件上传器 - 使用 WebSocket 扫描并上传指定文件夹中的所有文件")
-    parser.add_argument("api_key", help="您的 API 密钥 (作为用户 token)")
-    parser.add_argument("space_id", help="Space ID (作为 card_id)")
+    parser = argparse.ArgumentParser(description="一次性文件上传器 - 扫描并上传指定文件夹中的所有文件")
+    parser.add_argument("api_key", help="您的 API 密钥")
+    parser.add_argument("space_id", help="Space ID")
     parser.add_argument("--upload-dir", default="output", help="要上传的目录 (默认: output)")
-
+    
     args = parser.parse_args()
-
-    if not os.path.exists(args.upload_dir):
-        print(f"目录不存在: {args.upload_dir}")
-        exit(1)
-
-    print(f"🔍 开始扫描目录: {args.upload_dir}")
-    print(f"🔑 Space ID (card_id): {args.space_id}")
-    print("-" * 50)
-
-    success, failed = asyncio.run(upload_directory(args.space_id, args.api_key, args.upload_dir))
-
-    print("-" * 50)
-    print(f"📊 上传完成! 成功: {success}, 失败: {failed}")
-
-    if success > 0:
-        print("🎉 文件已成功上传到您的网盘!")
+    
+    # 开始一次性上传
+    upload_directory_once(args.upload_dir, args.api_key, args.space_id)