chore: 清理根目录散落文件

- 删除 restore_screenshot_service.py:一次性恢复脚本,已完成使命
- 取消追踪 .stats_test_cache.json、.web_stats_cache.json:
  运行时缓存文件,.gitignore 已忽略,本次清除历史误提交

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
CodexandClaude Opus 4.5 committed 2026-05-20 23:33:13 +08:00
1 parent a19fa35a0f
commit 77e797ae1c
3 files changed
-352

No files matched your search

-1
View File
@@ -1 +0,0 @@
{"ts": 1765641063.2151546, "counters": {"fudai_seen": 1, "fudai_open_detail": 1, "fudai_click_attend": 1, "fudai_attend_ok": 1, "fudai_result_win": 1}, "fudai_last": {"content": "测试内容A", "countdown": "10:00后开奖", "participants": 123, "copies": 5, "prize_value_yuan": 199.0, "updated_ts": 1765641063.1966858}, "events": [{"ts": 1765641063.1946857, "type": "fudai_seen", "meta": {"content": "测试内容A", "countdown": "", "participants": null, "copies": null, "prize_value_yuan": null}}, {"ts": 1765641063.1966858, "type": "fudai_open_detail", "meta": {"content": "测试内容A", "countdown": "10:00后开奖", "participants": 123, "copies": 5, "prize_value_yuan": 199.0}}, {"ts": 1765641063.1966858, "type": "fudai_click_attend", "meta": {"content": "测试内容A", "countdown": "10:00后开奖", "participants": 123, "copies": 5, "prize_value_yuan": 199.0}}, {"ts": 1765641063.1966858, "type": "fudai_attend_ok", "meta": {"content": "测试内容A", "countdown": "10:00后开奖", "participants": 123, "copies": 5, "prize_value_yuan": 199.0}}, {"ts": 1765641063.1966858, "type": "fudai_result_win", "meta": {"content": "测试内容A", "countdown": "10:00后开奖", "participants": 123, "copies": 5, "prize_value_yuan": 199.0}}], "wins": [{"ts": 1765641063.1966858, "content": "测试内容A", "countdown": "10:00后开奖", "participants": 123, "copies": 5, "prize_value_yuan": 199.0}]}
-1
View File
@@ -1 +0,0 @@
{"ts": 1765685532.6116447, "counters": {"fudai_open_detail": 74, "fudai_seen": 80, "fudai_skip_value_low": 28, "fudai_open_error": 8, "switch_room": 40, "switch_room_no_fudai": 28, "fudai_skip_countdown_short": 3, "switch_room_countdown": 3, "switch_room_value": 8, "fudai_click_attend": 2, "fudai_result_no_win": 2}, "fudai_last": {"content": "【粉丝专属】iPhone17手机256G颜色随机", "countdown": "14:29后开奖", "participants": 2132, "copies": 1, "prize_value_yuan": 5999.0, "updated_ts": 1765684579.3024325}, "events": [{"ts": 1765641806.1646142, "type": "fudai_open_detail", "meta": {"content": "", "countdown": "", "participants": null, "copies": null, "prize_value_yuan": null}}, {"ts": 1765641813.7004516, "type": "fudai_seen", "meta": {"content": "【懒猫nono专属】海蓝之谜精萃水沁润15ml补水保湿...", "countdown": "", "participants": null, "copies": null, "prize_value_yuan": null}}, {"ts": 1765641815.2687662, "type": "fudai_skip", "meta": {"reason": "value_low", "content": "【懒猫nono专属】海蓝之谜精萃水沁润15ml补水保湿...", "countdown": "07:19后开奖", "participants": 32, "copies": 1, "prize_value_yuan": 199.0}}, {"ts": 1765641819.8364112, "type": "fudai_open_detail", "meta": {"content": "【懒猫nono专属】海蓝之谜精萃水沁润15ml补水保湿...", "countdown": "07:19后开奖", "participants": 32, "copies": 1, "prize_value_yuan": 199.0}}, {"ts": 1765641826.9612343, "type": "fudai_seen", "meta": {"content": "【懒猫nono专属】海蓝之谜精萃水沁润15ml补水保湿...", "countdown": "07:19后开奖", "participants": 32, "copies": 1, "prize_value_yuan": 199.0}}, {"ts": 1765641829.2069504, "type": "fudai_skip", "meta": {"reason": "value_low", "content": "【懒猫nono专属】海蓝之谜精萃水沁润15ml补水保湿...", "countdown": "04:07", "participants": 34, "copies": 1, "prize_value_yuan": 199.0}}, {"ts": 1765641833.980556, "type": "fudai_open_detail", "meta": {"content": "【懒猫nono专属】海蓝之谜精萃水沁润15ml补水保湿...", "countdown": "04:07", "participants": 34, "copies": 1, "prize_value_yuan": 199.0}}, {"ts": 1765641841.1970615, "type": "fudai_seen", "meta": {"content": "【懒猫nono专属】海蓝之谜精萃水沁润15ml补水保湿...", "countdown": "04:07", "participants": 34, "copies": 1, "prize_value_yuan": 199.0}}, {"ts": 1765641842.785327, "type": "fudai_skip", "meta": {"reason": "value_low", "content": "【懒猫nono专属】海蓝之谜精萃水沁润15ml补水保湿...", "countdown": "06:50后开奖", "participants": 34, "copies": 1, "prize_value_yuan": 199.0}}, {"ts": 1765641848.7064586, "type": "fudai_open_detail", "meta": {"content": "【懒猫nono专属】海蓝之谜精萃水沁润15ml补水保湿...", "countdown": "06:50后开奖", "participants": 34, "copies": 1, "prize_value_yuan": 199.0}}, {"ts": 1765641857.2592785, "type": "fudai_seen", "meta": {"content": "【懒猫nono专属】海蓝之谜精萃水沁润15ml补水保湿...", "countdown": "06:50后开奖", "participants": 34, "copies": 1, "prize_value_yuan": 199.0}}, {"ts": 1765641858.9027817, "type": "fudai_skip", "meta": {"reason": "value_low", "content": "【懒猫nono专属】海蓝之谜精萃水沁润15ml补水保湿...", "countdown": "06:35后开奖", "participants": 35, "copies": 1, "prize_value_yuan": 199.0}}, {"ts": 1765641863.3506944, "type": "fudai_open_detail", "meta": {"content": "【懒猫nono专属】海蓝之谜精萃水沁润15ml补水保湿...", "countdown": "06:35后开奖", "participants": 35, "copies": 1, "prize_value_yuan": 199.0}}, {"ts": 1765641869.6957817, "type": "fudai_seen", "meta": {"content": "【懒猫nono专属】海蓝之谜精萃水沁润15ml补水保湿...", "countdown": "06:35后开奖", "participants": 35, "copies": 1, "prize_value_yuan": 199.0}}, {"ts": 1765641871.0666997, "type": "fudai_skip", "meta": {"reason": "value_low", "content": "【懒猫nono专属】海蓝之谜精萃水沁润15ml补水保湿...", "countdown": "06:21", "participants": 35, "copies": 1, "prize_value_yuan": 199.0}}, {"ts": 1765641875.5607815, "type": "fudai_open_detail", "meta": {"content": "【懒猫nono专属】海蓝之谜精萃水沁润15ml补水保湿...", "countdown": "06:21", "participants": 35, "copies": 1, "prize_value_yuan": 199.0}}, {"ts": 1765641882.6100206, "type": "fudai_seen", "meta": {"content": "【懒猫nono专属】海蓝之谜精萃水沁润15ml补水保湿...", "countdown": "06:21", "participants": 35, "copies": 1, "prize_value_yuan": 199.0}}, {"ts": 1765641883.8911793, "type": "fudai_skip", "meta": {"reason": "value_low", "content": "【懒猫nono专属】海蓝之谜精萃水沁润15ml补水保湿...", "countdown": "06:09", "participants": 36, "copies": 1, "prize_value_yuan": 199.0}}, {"ts": 1765641888.1028545, "type": "fudai_open_detail", "meta": {"content": "【懒猫nono专属】海蓝之谜精萃水沁润15ml补水保湿...", "countdown": "06:09", "participants": 36, "copies": 1, "prize_value_yuan": 1Line truncated
-350
View File
@@ -1,350 +0,0 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
"""
恢复screenshot_service.py文件
"""
content = '''"""后台截图服务:持续截图,主流程直接读取最新截图
功能:
1. 后台持续截图,避免主流程等待
2. 截图缓存机制,减少重复截图
3. 智能线程数配置,根据CPU核心数自动调整
"""
from __future__ import annotations
import os
import threading
import time
from typing import Optional
from datetime import datetime
import path_config
from operations.screenshot_operations import ScreenshotOperations
class ScreenshotService:
"""后台截图服务:持续截图,避免主流程等待"""
_instance: Optional['ScreenshotService'] = None
_lock = threading.Lock()
def __init__(self):
self._running: bool = False
self._thread: Optional[threading.Thread] = None
self._screenshot_ops: ScreenshotOperations = ScreenshotOperations()
self._current_device_id: Optional[str] = None
# 修复:初始化为过去时间,确保第一次请求时缓存过期但时间差合理
self._last_screenshot_time = time.time() - 10.0 # 10秒前,避免巨大时间差
self._screenshot_interval = 3.5 # 增加间隔到3.5秒,适应实际截图耗时
self._cache_valid_duration = 4.0 # 增加缓存有效期到4.0秒,避免频繁过期
self._screenshot_path: Optional[str] = None
self._last_success = False # 最后一次截图是否成功
@classmethod
def get_instance(cls) -> 'ScreenshotService':
"""获取单例实例"""
if cls._instance is None:
with cls._lock:
if cls._instance is None:
cls._instance = cls()
return cls._instance
def start(self, device_id: str, interval: float = 1.5):
"""启动后台截图服务
参数:
device_id: 设备ID
interval: 截图间隔(秒),默认1.5秒
"""
with self._lock:
if self._running:
if self._current_device_id == device_id:
return # 已经在运行,且设备ID相同
self.stop() # 设备ID不同,先停止
self._current_device_id = device_id
self._screenshot_interval = max(0.5, interval) # 最小0.5秒
self._running = True
# 初始化截图路径
try:
self._screenshot_path = path_config.get_screenshot_path()
except (ImportError, AttributeError, OSError):
self._screenshot_path = os.path.join("pic", "screenshot.png")
self._thread = threading.Thread(
target=self._screenshot_loop,
daemon=True,
name="ScreenshotService"
)
self._thread.start()
# 修复:设置时间戳为过去足够长的时间,确保第一次请求能等到后台截图完成
self._last_screenshot_time = time.time() - self._cache_valid_duration - 1.0 # 确保缓存过期但不至于太旧
timetag = datetime.now().strftime("%H:%M:%S")
print(f"[{timetag}] [截图服务] 已启动后台截图服务,设备: {device_id}, 间隔: {interval}秒")
def stop(self):
"""停止后台截图服务"""
with self._lock:
if not self._running:
return
self._running = False
if self._thread and self._thread.is_alive():
self._thread.join(timeout=2.0)
timetag = datetime.now().strftime("%H:%M:%S")
print(f"[{timetag}] [截图服务] 已停止后台截图服务")
def _screenshot_loop(self):
"""后台截图循环"""
loop_count = 0
while self._running:
try:
device_id = self._current_device_id
if not device_id:
time.sleep(0.1)
continue
loop_count += 1
timetag = datetime.now().strftime("%H:%M:%S")
screenshot_start = time.time()
# 执行截图(禁用服务模式,避免递归)
success = self._screenshot_ops.get_screenshot(device_id, use_service=False) # type: ignore[arg-type]
screenshot_elapsed = (time.time() - screenshot_start) * 1000
if success:
# 验证文件完整性后再更新时间戳(避免读取到不完整的文件)
if self._screenshot_path and os.path.exists(self._screenshot_path):
try:
file_size = os.path.getsize(self._screenshot_path)
if file_size >= 1024:
with open(self._screenshot_path, 'rb') as f:
header = f.read(4)
if header == b'\\x89PNG':
self._last_screenshot_time = time.time()
self._last_success = True
print(f"[{timetag}] [截图服务] 后台截图完成 #{loop_count},耗时: {screenshot_elapsed:.0f}ms,文件大小: {file_size/1024:.1f}KB")
else:
self._last_success = False
print(f"[{timetag}] [截图服务] 后台截图文件格式错误 #{loop_count},耗时: {screenshot_elapsed:.0f}ms")
else:
self._last_success = False
print(f"[{timetag}] [截图服务] 后台截图文件太小 #{loop_count} ({file_size}B),耗时: {screenshot_elapsed:.0f}ms")
except (OSError, IOError, ValueError) as e:
self._last_success = False
print(f"[{timetag}] [截图服务] 后台截图文件验证失败 #{loop_count}: {e},耗时: {screenshot_elapsed:.0f}ms")
else:
self._last_success = False
print(f"[{timetag}] [截图服务] 后台截图文件不存在 #{loop_count},耗时: {screenshot_elapsed:.0f}ms")
else:
self._last_success = False
print(f"[{timetag}] [截图服务] 后台截图失败 #{loop_count},耗时: {screenshot_elapsed:.0f}ms")
# 等待间隔时间,确保不小于0.5秒
remaining_interval = max(0.5, self._screenshot_interval - screenshot_elapsed / 1000)
time.sleep(remaining_interval)
except Exception as e:
try:
timetag = datetime.now().strftime("%H:%M:%S")
print(f"[{timetag}] [截图服务] 后台截图异常: {e}")
import traceback
traceback.print_exc()
except Exception:
pass
time.sleep(1.0) # 异常时等待1秒再继续
def get_screenshot(self, device_id: str, force: bool = False) -> bool:
"""获取截图(优先使用缓存)
参数:
device_id: 设备ID
force: 是否强制重新截图(忽略缓存)
返回:
是否成功获取截图
"""
request_start = time.time()
timetag = datetime.now().strftime("%H:%M:%S")
# 如果设备ID不同,需要重新启动服务
if self._current_device_id != device_id:
print(f"[{timetag}] [截图服务] 设备ID变更,重新启动服务: {device_id}")
self.start(device_id)
# 等待第一次截图完成
time.sleep(0.1)
# 检查缓存是否有效
if not force:
now = time.time()
time_since_last = now - self._last_screenshot_time
# 修复:添加边界检查,避免负数或异常值
if time_since_last < 0:
time_since_last = 0 # 避免时钟回拨导致的负数
elif time_since_last > 86400: # 如果超过24小时,可能是时间戳错误
time_since_last = 10.0 # 重置为10秒前
# 检查缓存是否有效(时间 + 文件存在 + 文件完整性)
if time_since_last < self._cache_valid_duration:
if self._screenshot_path and os.path.exists(self._screenshot_path):
# 验证文件完整性(避免读取到不完整的文件)
# 使用重试机制,等待文件写入完成
for retry in range(3):
try:
file_size = os.path.getsize(self._screenshot_path)
if file_size >= 1024: # PNG文件至少1KB
# 尝试快速验证文件头(PNG文件头:89 50 4E 47)
with open(self._screenshot_path, 'rb') as f:
header = f.read(4)
if header == b'\\x89PNG':
# 验证文件尾(PNG文件尾:IEND)
# 更宽松的验证:检查文件末尾50字节内是否有IEND
try:
# 读取文件末尾50字节
read_size = min(50, file_size)
f.seek(-read_size, 2)
footer = f.read(read_size)
if b'IEND' in footer:
elapsed = (time.time() - request_start) * 1000
print(f"[{timetag}] [截图服务] [OK] 缓存命中,耗时: {elapsed:.1f}ms (距离上次截图: {time_since_last*1000:.0f}ms, 文件大小: {file_size/1024:.1f}KB)")
return True
elif retry < 2:
# 文件可能还在写入,等待一下
time.sleep(0.1)
continue
else:
print(f"[{timetag}] [截图服务] [WARN] 缓存文件不完整(文件尾验证失败),等待后台截图")
except (OSError, IOError) as e:
if retry < 2:
time.sleep(0.1)
continue
else:
print(f"[{timetag}] [截图服务] [WARN] 缓存文件读取失败: {e},等待后台截图")
else:
print(f"[{timetag}] [截图服务] [WARN] 缓存文件格式错误,等待后台截图")
break
else:
if retry < 2:
time.sleep(0.05)
continue
else:
print(f"[{timetag}] [截图服务] [WARN] 缓存文件太小 ({file_size}B),等待后台截图")
except (OSError, IOError) as e:
if retry < 2:
time.sleep(0.05)
continue
else:
print(f"[{timetag}] [截图服务] [WARN] 缓存文件检查失败: {e},等待后台截图")
except ValueError as e:
print(f"[{timetag}] [截图服务] [WARN] 缓存文件检查异常: {e},等待后台截图")
break
else:
print(f"[{timetag}] [截图服务] [WARN] 缓存文件不存在,等待后台截图")
else:
print(f"[{timetag}] [截图服务] [WARN] 缓存已过期 (距离上次: {time_since_last*1000:.0f}ms > {self._cache_valid_duration*1000:.0f}ms),等待后台截图")
# 缓存无效或强制刷新
if force:
print(f"[{timetag}] [截图服务] 强制刷新,忽略缓存")
# 等待后台截图完成
if self._running:
wait_start = time.time()
time_since_last_before_wait = time.time() - self._last_screenshot_time
# 修复:添加边界检查
if time_since_last_before_wait < 0:
time_since_last_before_wait = 0
elif time_since_last_before_wait > 86400:
time_since_last_before_wait = 10.0
print(f"[{timetag}] [截图服务] [WAIT] 缓存未命中,等待后台截图 (距离上次: {time_since_last_before_wait*1000:.0f}ms)")
# 等待最多6秒,让后台线程完成截图(适应较慢的截图操作)
max_wait_time = 6.0
while time.time() - wait_start < max_wait_time:
if self._last_screenshot_time > wait_start - 0.1:
# 截图已完成,验证文件完整性
if self._screenshot_path and os.path.exists(self._screenshot_path):
try:
file_size = os.path.getsize(self._screenshot_path)
if file_size >= 1024:
with open(self._screenshot_path, 'rb') as f:
header = f.read(4)
if header == b'\\x89PNG':
# 验证文件尾(更宽松的验证)
read_size = min(50, file_size)
f.seek(-read_size, 2)
footer = f.read(read_size)
if b'IEND' in footer:
wait_elapsed = (time.time() - wait_start) * 1000
total_elapsed = (time.time() - request_start) * 1000
status = "[OK]" if self._last_success else "[FAIL]"
print(f"[{timetag}] [截图服务] {status} 后台截图完成,等待耗时: {wait_elapsed:.1f}ms,总耗时: {total_elapsed:.1f}ms,文件大小: {file_size/1024:.1f}KB")
return self._last_success
# 文件尾验证失败,继续等待
# 文件太小或格式错误,继续等待
except (OSError, IOError, ValueError):
# 文件验证失败,继续等待
pass
time.sleep(0.1)
# 等待超时
wait_elapsed = (time.time() - wait_start) * 1000
print(f"[{timetag}] [截图服务] [TIMEOUT] 等待超时 ({wait_elapsed:.1f}ms),回退到直接截图")
# 如果后台服务未运行或等待超时,直接执行截图(禁用服务模式,避免递归)
direct_start = time.time()
result = self._screenshot_ops.get_screenshot(device_id, use_service=False) # type: ignore[arg-type]
direct_elapsed = (time.time() - direct_start) * 1000
total_elapsed = (time.time() - request_start) * 1000
status = "[OK]" if result else "[FAIL]"
print(f"[{timetag}] [截图服务] {status} 直接截图完成,耗时: {direct_elapsed:.0f}ms,总耗时: {total_elapsed:.1f}ms")
return result
def is_running(self) -> bool:
"""检查服务是否正在运行"""
return self._running
def get_last_screenshot_time(self) -> float:
"""获取最后一次截图的时间戳"""
return self._last_screenshot_time
def get_cache_info(self) -> dict:
"""获取缓存信息(用于调试)"""
return {
"running": self._running,
"device_id": self._current_device_id,
"last_screenshot_time": self._last_screenshot_time,
"interval": self._screenshot_interval,
"cache_valid_duration": self._cache_valid_duration,
"last_success": self._last_success,
}
def get_optimal_workers() -> int:
"""根据CPU核心数获取最优线程数
返回:
推荐的线程数
"""
cpu_count = os.cpu_count() or 4
# 针对12核CPU的优化配置
if cpu_count >= 12:
return 10 # 12核:使用10个线程
elif cpu_count >= 8:
return 8 # 8核:使用8个线程
elif cpu_count >= 4:
return 6 # 4核:使用6个线程
elif cpu_count >= 2:
return 3 # 2核:使用3个线程
else:
return 2 # 单核:使用2个线程(I/O等待)
'''
# 写入文件
with open('operations/screenshot_service.py', 'w', encoding='utf-8') as f:
f.write(content)
print('ScreenshotService file restored successfully')