Files
GuDong 954bb5b9bb feat: 手动刷新保护机制 + 密码登录失败退避 + 扫码登录缓冲 + 图片上传错误追踪
XianyuAutoAsync:
- 新增手动刷新保护期(begin/end_manual_refresh),防止手动刷新与自动刷新互踩
- 新增密码登录失败退避机制(classify_password_login_failure),按错误类型设定不同冷却时间
- 新增扫码登录缓冲状态(qr_login_grace),首轮token命中风控时先做浏览器侧Cookie稳定化
- 新增网页登录态验证(_verify_cookie_validity)
- 自动滑块/Cookie刷新流程增加手动刷新冲突检测

image_uploader:
- 新增错误类型追踪(last_error_type/message/status),调用方可判断失败原因
2026-03-26 15:00:58 +08:00

258 lines
11 KiB
Python

"""
图片上传器 - 负责将图片上传到闲鱼CDN
"""
import aiohttp
import asyncio
import json
import os
import tempfile
from typing import Optional, Dict, Any
from loguru import logger
from PIL import Image
import io
class ImageUploader:
"""图片上传器 - 上传图片到闲鱼CDN"""
def __init__(self, cookies_str: str):
self.cookies_str = cookies_str
self.upload_url = "https://stream-upload.goofish.com/api/upload.api?floderId=0&appkey=xy_chat&_input_charset=utf-8"
self.session = None
self.last_error_type = None
self.last_error_message = None
self.last_http_status = None
def _set_last_error(self, error_type: Optional[str], message: Optional[str] = None, status: Optional[int] = None):
self.last_error_type = error_type
self.last_error_message = message
self.last_http_status = status
async def create_session(self):
"""创建HTTP会话"""
if not self.session:
connector = aiohttp.TCPConnector(limit=100, limit_per_host=30)
timeout = aiohttp.ClientTimeout(total=30)
self.session = aiohttp.ClientSession(
connector=connector,
timeout=timeout,
headers={
'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36'
}
)
async def close_session(self):
"""关闭HTTP会话"""
if self.session:
await self.session.close()
self.session = None
def _compress_image(self, image_path: str, max_size: int = 5 * 1024 * 1024, quality: int = 85) -> Optional[str]:
"""压缩图片"""
try:
with Image.open(image_path) as img:
# 转换为RGB模式(如果是RGBA或其他模式)
if img.mode in ('RGBA', 'LA', 'P'):
# 创建白色背景
background = Image.new('RGB', img.size, (255, 255, 255))
if img.mode == 'P':
img = img.convert('RGBA')
background.paste(img, mask=img.split()[-1] if img.mode in ('RGBA', 'LA') else None)
img = background
elif img.mode != 'RGB':
img = img.convert('RGB')
# 获取原始尺寸
original_width, original_height = img.size
# 如果图片太大,调整尺寸
max_dimension = 1920
if original_width > max_dimension or original_height > max_dimension:
if original_width > original_height:
new_width = max_dimension
new_height = int((original_height * max_dimension) / original_width)
else:
new_height = max_dimension
new_width = int((original_width * max_dimension) / original_height)
img = img.resize((new_width, new_height), Image.Resampling.LANCZOS)
logger.info(f"图片尺寸调整: {original_width}x{original_height} -> {new_width}x{new_height}")
# 创建临时文件
temp_fd, temp_path = tempfile.mkstemp(suffix='.jpg')
os.close(temp_fd)
# 保存压缩后的图片
img.save(temp_path, 'JPEG', quality=quality, optimize=True)
# 检查文件大小
file_size = os.path.getsize(temp_path)
if file_size > max_size:
# 如果还是太大,降低质量
quality = max(30, quality - 20)
img.save(temp_path, 'JPEG', quality=quality, optimize=True)
file_size = os.path.getsize(temp_path)
logger.info(f"图片质量调整为 {quality}%,文件大小: {file_size / 1024:.1f}KB")
logger.info(f"图片压缩完成: {file_size / 1024:.1f}KB")
return temp_path
except Exception as e:
logger.error(f"图片压缩失败: {e}")
return None
async def upload_image(self, image_path: str) -> Optional[str]:
"""上传图片到闲鱼CDN"""
temp_path = None
self._set_last_error(None)
try:
if not self.session:
await self.create_session()
# 压缩图片
temp_path = self._compress_image(image_path)
if not temp_path:
logger.error("图片压缩失败")
return None
# 读取压缩后的图片数据
with open(temp_path, 'rb') as f:
image_data = f.read()
# 构造文件名
filename = os.path.basename(image_path)
if not filename.lower().endswith(('.jpg', '.jpeg')):
filename = os.path.splitext(filename)[0] + '.jpg'
# 构造请求头
headers = {
'cookie': self.cookies_str,
'Referer': 'https://www.goofish.com/',
'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36',
'x-requested-with': 'XMLHttpRequest',
'Accept': 'application/json, text/javascript, */*; q=0.01',
'Accept-Language': 'zh-CN,zh;q=0.9,en;q=0.8',
'Accept-Encoding': 'gzip, deflate, br',
'Connection': 'keep-alive',
'Sec-Fetch-Dest': 'empty',
'Sec-Fetch-Mode': 'cors',
'Sec-Fetch-Site': 'same-site'
}
# 构造multipart/form-data
data = aiohttp.FormData()
data.add_field('file', image_data, filename=filename, content_type='image/jpeg')
# 发送上传请求
logger.info(f"开始上传图片到闲鱼CDN: {filename}")
async with self.session.post(self.upload_url, data=data, headers=headers) as response:
if response.status == 200:
response_text = await response.text()
logger.debug(f"上传响应: {response_text}")
# 解析响应获取图片URL
image_url = self._parse_upload_response(response_text)
if image_url:
self._set_last_error(None)
logger.info(f"图片上传成功: {image_url}")
return image_url
else:
logger.error("解析上传响应失败")
return None
else:
error_type = 'auth' if response.status in (401, 403) else 'http'
self._set_last_error(error_type, f"HTTP {response.status}", response.status)
logger.error(f"图片上传失败: HTTP {response.status}")
return None
except (aiohttp.ClientError, asyncio.TimeoutError) as e:
self._set_last_error('network', str(e))
logger.error(f"图片上传异常: {e}")
return None
except Exception as e:
self._set_last_error('unknown', str(e))
logger.error(f"图片上传异常: {e}")
return None
finally:
# 清理临时文件
if temp_path and os.path.exists(temp_path):
try:
os.remove(temp_path)
except:
pass
def _parse_upload_response(self, response_text: str) -> Optional[str]:
"""解析上传响应获取图片URL"""
try:
# 检查是否返回了登录页面(Cookie失效的标志)
if '<!DOCTYPE html>' in response_text or '<html>' in response_text:
if '闲鱼' in response_text and ('login' in response_text.lower() or 'mini-login' in response_text):
self._set_last_error('auth', '返回登录页面')
logger.error("❌ 图片上传失败:Cookie已失效,返回了登录页面!请重新登录获取有效的Cookie")
logger.error("💡 解决方法:")
logger.error(" 1. 打开浏览器访问 https://www.goofish.com/")
logger.error(" 2. 登录您的闲鱼账号")
logger.error(" 3. 按F12打开开发者工具,在控制台输入: document.cookie")
logger.error(" 4. 复制完整的Cookie字符串,更新配置文件中的Cookie")
return None
else:
self._set_last_error('html_response', '返回HTML页面')
logger.error(f"收到HTML响应而非JSON,可能是Cookie失效: {response_text[:500]}")
return None
# 尝试解析JSON响应
response_data = json.loads(response_text)
# 方式1: 标准响应格式
if 'data' in response_data and 'url' in response_data['data']:
self._set_last_error(None)
return response_data['data']['url']
# 方式2: 在object字段中(闲鱼CDN的响应格式)
if 'object' in response_data and isinstance(response_data['object'], dict):
obj = response_data['object']
if 'url' in obj:
self._set_last_error(None)
logger.info(f"从object.url提取到图片URL: {obj['url']}")
return obj['url']
# 方式3: 直接在根级别
if 'url' in response_data:
self._set_last_error(None)
return response_data['url']
# 方式4: 在result中
if 'result' in response_data and 'url' in response_data['result']:
self._set_last_error(None)
return response_data['result']['url']
# 方式5: 检查是否有文件信息
if 'data' in response_data and isinstance(response_data['data'], dict):
data = response_data['data']
if 'fileUrl' in data:
self._set_last_error(None)
return data['fileUrl']
if 'file_url' in data:
self._set_last_error(None)
return data['file_url']
self._set_last_error('response_parse', '无法从响应中提取图片URL')
logger.error(f"无法从响应中提取图片URL: {response_data}")
return None
except json.JSONDecodeError:
# 如果不是JSON格式,尝试其他解析方式
self._set_last_error('response_parse', '响应不是有效JSON格式')
logger.error(f"响应不是有效的JSON格式,可能是Cookie失效: {response_text[:200]}...")
return None
except Exception as e:
logger.error(f"解析上传响应异常: {e}")
return None
async def __aenter__(self):
await self.create_session()
return self
async def __aexit__(self, exc_type, exc_val, exc_tb):
await self.close_session()