Merge pull request millylee#26 from millylee/feature/notify-limit

签到出错或账号中有余额变动才提醒

Author: millylee

.github/workflows/checkin.yml

@@ -21,9 +21,21 @@ jobs:
       with:
         python-version: '3.11'
 
+    - name: 缓存 UV 依赖
+      uses: actions/cache@v4
+      id: uv-cache
+      with:
+        path: |
+          ~/.cache/uv
+          .venv
+        key: ${{ runner.os }}-uv-${{ hashFiles('pyproject.toml', 'uv.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-uv-
+
     - name: 安装依赖
+      if: steps.uv-cache.outputs.cache-hit != 'true'
       run: |
-        echo "正在安装项目依赖..."
+        echo "缓存未命中，开始安装项目依赖..."
         uv sync
         echo "✅ 环境初始化完成"
 
@@ -49,6 +61,14 @@ jobs:
         echo "缓存未命中，开始安装 Playwright 浏览器..."
         uv run playwright install chromium --with-deps
 
+    - name: 恢复余额历史缓存
+      uses: actions/cache@v4
+      with:
+        path: balance_hash.txt
+        key: balance-hash-${{ github.sha }}
+        restore-keys: |
+          balance-hash-
+
     - name: 执行签到
       env:
         ANYROUTER_ACCOUNTS: ${{ secrets.ANYROUTER_ACCOUNTS }}

checkin.py

@@ -4,6 +4,7 @@
 """
 
 import asyncio
+import hashlib
 import json
 import os
 import sys
@@ -17,6 +18,8 @@
 
 load_dotenv()
 
+BALANCE_HASH_FILE = 'balance_hash.txt'
+
 
 def load_accounts():
 	"""从环境变量加载多账号配置"""
@@ -48,6 +51,32 @@ def load_accounts():
 		return None
 
 
+def load_balance_hash():
+	"""加载余额hash"""
+	try:
+		if os.path.exists(BALANCE_HASH_FILE):
+			with open(BALANCE_HASH_FILE, 'r', encoding='utf-8') as f:
+				return f.read().strip()
+	except Exception:
+		pass
+	return None
+
+
+def save_balance_hash(balance_hash):
+	"""保存余额hash"""
+	try:
+		with open(BALANCE_HASH_FILE, 'w', encoding='utf-8') as f:
+			f.write(balance_hash)
+	except Exception as e:
+		print(f'Warning: Failed to save balance hash: {e}')
+
+
+def generate_balance_hash(balances):
+	"""生成余额数据的hash"""
+	balance_json = json.dumps(balances, sort_keys=True, separators=(',', ':'))
+	return hashlib.sha256(balance_json.encode('utf-8')).hexdigest()[:16]
+
+
 def parse_cookies(cookies_data):
 	"""解析 cookies 数据"""
 	if isinstance(cookies_data, dict):
@@ -68,59 +97,63 @@ async def get_waf_cookies_with_playwright(account_name: str):
 	print(f'[PROCESSING] {account_name}: Starting browser to get WAF cookies...')
 
 	async with async_playwright() as p:
-		context = await p.chromium.launch_persistent_context(
-			user_data_dir=None,
-			headless=False,
-			user_agent='Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36',
-			viewport={'width': 1920, 'height': 1080},
-			args=[
-				'--disable-blink-features=AutomationControlled',
-				'--disable-dev-shm-usage',
-				'--disable-web-security',
-				'--disable-features=VizDisplayCompositor',
-				'--no-sandbox',
-			],
-		)
-
-		page = await context.new_page()
+		import tempfile
+		with tempfile.TemporaryDirectory() as temp_dir:
+			context = await p.chromium.launch_persistent_context(
+				user_data_dir=temp_dir,
+				headless=False,
+				user_agent='Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36',
+				viewport={'width': 1920, 'height': 1080},
+				args=[
+					'--disable-blink-features=AutomationControlled',
+					'--disable-dev-shm-usage',
+					'--disable-web-security',
+					'--disable-features=VizDisplayCompositor',
+					'--no-sandbox',
+				],
+				)
+
+			page = await context.new_page()
 
-		try:
-			print(f'[PROCESSING] {account_name}: Step 1: Access login page to get initial cookies...')
+			try:
+				print(f'[PROCESSING] {account_name}: Step 1: Access login page to get initial cookies...')
 
-			await page.goto('https://anyrouter.top/login', wait_until='networkidle')
+				await page.goto('https://anyrouter.top/login', wait_until='networkidle')
 
-			try:
-				await page.wait_for_function('document.readyState === "complete"', timeout=5000)
-			except Exception:
-				await page.wait_for_timeout(3000)
+				try:
+					await page.wait_for_function('document.readyState === "complete"', timeout=5000)
+				except Exception:
+					await page.wait_for_timeout(3000)
 
-			cookies = await page.context.cookies()
+				cookies = await page.context.cookies()
 
-			waf_cookies = {}
-			for cookie in cookies:
-				if cookie['name'] in ['acw_tc', 'cdn_sec_tc', 'acw_sc__v2']:
-					waf_cookies[cookie['name']] = cookie['value']
+				waf_cookies = {}
+				for cookie in cookies:
+					cookie_name = cookie.get('name')
+					cookie_value = cookie.get('value')
+					if cookie_name in ['acw_tc', 'cdn_sec_tc', 'acw_sc__v2'] and cookie_value is not None:
+						waf_cookies[cookie_name] = cookie_value
 
-			print(f'[INFO] {account_name}: Got {len(waf_cookies)} WAF cookies after step 1')
+				print(f'[INFO] {account_name}: Got {len(waf_cookies)} WAF cookies after step 1')
 
-			required_cookies = ['acw_tc', 'cdn_sec_tc', 'acw_sc__v2']
-			missing_cookies = [c for c in required_cookies if c not in waf_cookies]
+				required_cookies = ['acw_tc', 'cdn_sec_tc', 'acw_sc__v2']
+				missing_cookies = [c for c in required_cookies if c not in waf_cookies]
 
-			if missing_cookies:
-				print(f'[FAILED] {account_name}: Missing WAF cookies: {missing_cookies}')
-				await context.close()
-				return None
+				if missing_cookies:
+					print(f'[FAILED] {account_name}: Missing WAF cookies: {missing_cookies}')
+					await context.close()
+					return None
 
-			print(f'[SUCCESS] {account_name}: Successfully got all WAF cookies')
+				print(f'[SUCCESS] {account_name}: Successfully got all WAF cookies')
 
-			await context.close()
+				await context.close()
 
-			return waf_cookies
+				return waf_cookies
 
-		except Exception as e:
-			print(f'[FAILED] {account_name}: Error occurred while getting WAF cookies: {e}')
-			await context.close()
-			return None
+			except Exception as e:
+				print(f'[FAILED] {account_name}: Error occurred while getting WAF cookies: {e}')
+				await context.close()
+				return None
 
 
 def get_user_info(client, headers):
@@ -134,10 +167,15 @@ def get_user_info(client, headers):
 				user_data = data.get('data', {})
 				quota = round(user_data.get('quota', 0) / 500000, 2)
 				used_quota = round(user_data.get('used_quota', 0) / 500000, 2)
-				return f':money: Current balance: ${quota}, Used: ${used_quota}'
+				return {
+					'success': True,
+					'quota': quota,
+					'used_quota': used_quota,
+					'display': f':money: Current balance: ${quota}, Used: ${used_quota}'
+				}
+		return {'success': False, 'error': f'Failed to get user info: HTTP {response.status_code}'}
 	except Exception as e:
-		return f'[FAIL] Failed to get user info: {str(e)[:50]}...'
-	return None
+		return {'success': False, 'error': f'Failed to get user info: {str(e)[:50]}...'}
 
 
 async def check_in_account(account_info, account_index):
@@ -187,12 +225,11 @@ async def check_in_account(account_info, account_index):
 			'new-api-user': api_user,
 		}
 
-		user_info_text = None
-
 		user_info = get_user_info(client, headers)
-		if user_info:
-			print(user_info)
-			user_info_text = user_info
+		if user_info and user_info.get('success'):
+			print(user_info['display'])
+		elif user_info:
+			print(user_info.get('error', 'Unknown error'))
 
 		print(f'[NETWORK] {account_name}: Executing check-in')
 
@@ -209,26 +246,26 @@ async def check_in_account(account_info, account_index):
 				result = response.json()
 				if result.get('ret') == 1 or result.get('code') == 0 or result.get('success'):
 					print(f'[SUCCESS] {account_name}: Check-in successful!')
-					return True, user_info_text
+					return True, user_info
 				else:
 					error_msg = result.get('msg', result.get('message', 'Unknown error'))
 					print(f'[FAILED] {account_name}: Check-in failed - {error_msg}')
-					return False, user_info_text
+					return False, user_info
 			except json.JSONDecodeError:
 				# 如果不是 JSON 响应，检查是否包含成功标识
 				if 'success' in response.text.lower():
 					print(f'[SUCCESS] {account_name}: Check-in successful!')
-					return True, user_info_text
+					return True, user_info
 				else:
 					print(f'[FAILED] {account_name}: Check-in failed - Invalid response format')
-					return False, user_info_text
+					return False, user_info
 		else:
 			print(f'[FAILED] {account_name}: Check-in failed - HTTP {response.status_code}')
-			return False, user_info_text
+			return False, user_info
 
 	except Exception as e:
 		print(f'[FAILED] {account_name}: Error occurred during check-in process - {str(e)[:50]}...')
-		return False, user_info_text
+		return False, None
 	finally:
 		client.close()
 
@@ -246,47 +283,109 @@ async def main():
 
 	print(f'[INFO] Found {len(accounts)} account configurations')
 
+	# 加载余额hash
+	last_balance_hash = load_balance_hash()
+
 	# 为每个账号执行签到
 	success_count = 0
 	total_count = len(accounts)
 	notification_content = []
+	current_balances = {}
+	need_notify = False  # 是否需要发送通知
+	balance_changed = False  # 余额是否有变化
 
 	for i, account in enumerate(accounts):
+		account_key = f'account_{i + 1}'
 		try:
 			success, user_info = await check_in_account(account, i)
 			if success:
 				success_count += 1
-			# 收集通知内容
-			status = '[SUCCESS]' if success else '[FAIL]'
-			account_result = f'{status} Account {i + 1}'
-			if user_info:
-				account_result += f'\n{user_info}'
-			notification_content.append(account_result)
+
+			# 检查是否需要通知
+			should_notify_this_account = False
+
+			# 如果签到失败，需要通知
+			if not success:
+				should_notify_this_account = True
+				need_notify = True
+				print(f'[NOTIFY] Account {i + 1} failed, will send notification')
+
+			# 收集余额数据
+			if user_info and user_info.get('success'):
+				current_quota = user_info['quota']
+				current_balances[account_key] = current_quota
+
+			# 只有需要通知的账号才收集内容
+			if should_notify_this_account:
+				status = '[SUCCESS]' if success else '[FAIL]'
+				account_result = f'{status} Account {i + 1}'
+				if user_info and user_info.get('success'):
+					account_result += f'\n{user_info["display"]}'
+				elif user_info:
+					account_result += f'\n{user_info.get("error", "Unknown error")}'
+				notification_content.append(account_result)
+
 		except Exception as e:
 			print(f'[FAILED] Account {i + 1} processing exception: {e}')
+			need_notify = True  # 异常也需要通知
 			notification_content.append(f'[FAIL] Account {i + 1} exception: {str(e)[:50]}...')
 
-	# 构建通知内容
-	summary = [
-		'[STATS] Check-in result statistics:',
-		f'[SUCCESS] Success: {success_count}/{total_count}',
-		f'[FAIL] Failed: {total_count - success_count}/{total_count}',
-	]
-
-	if success_count == total_count:
-		summary.append('[SUCCESS] All accounts check-in successful!')
-	elif success_count > 0:
-		summary.append('[WARN] Some accounts check-in successful')
-	else:
-		summary.append('[ERROR] All accounts check-in failed')
-
-	time_info = f'[TIME] Execution time: {datetime.now().strftime("%Y-%m-%d %H:%M:%S")}'
+	# 检查余额变化
+	current_balance_hash = generate_balance_hash(current_balances) if current_balances else None
+	if current_balance_hash:
+		if last_balance_hash is None:
+			# 首次运行
+			balance_changed = True
+			need_notify = True
+			print('[NOTIFY] First run detected, will send notification with current balances')
+		elif current_balance_hash != last_balance_hash:
+			# 余额有变化
+			balance_changed = True
+			need_notify = True
+			print('[NOTIFY] Balance changes detected, will send notification')
+		else:
+			print('[INFO] No balance changes detected')
+
+	# 为有余额变化的情况添加所有成功账号到通知内容
+	if balance_changed:
+		for i, account in enumerate(accounts):
+			account_key = f'account_{i + 1}'
+			if account_key in current_balances:
+				# 只添加成功获取余额的账号，且避免重复添加
+				account_result = f'[BALANCE] Account {i + 1}'
+				account_result += f'\n:money: Current balance: ${current_balances[account_key]}'
+				# 检查是否已经在通知内容中（避免重复）
+				if not any(f'Account {i + 1}' in item for item in notification_content):
+					notification_content.append(account_result)
+
+	# 保存当前余额hash
+	if current_balance_hash:
+		save_balance_hash(current_balance_hash)
+
+	if need_notify and notification_content:
+		# 构建通知内容
+		summary = [
+			'[STATS] Check-in result statistics:',
+			f'[SUCCESS] Success: {success_count}/{total_count}',
+			f'[FAIL] Failed: {total_count - success_count}/{total_count}',
+		]
+
+		if success_count == total_count:
+			summary.append('[SUCCESS] All accounts check-in successful!')
+		elif success_count > 0:
+			summary.append('[WARN] Some accounts check-in successful')
+		else:
+			summary.append('[ERROR] All accounts check-in failed')
 
-	notify_content = '\n\n'.join([time_info, '\n'.join(notification_content), '\n'.join(summary)])
+		time_info = f'[TIME] Execution time: {datetime.now().strftime("%Y-%m-%d %H:%M:%S")}'
 
-	print(notify_content)
+		notify_content = '\n\n'.join([time_info, '\n'.join(notification_content), '\n'.join(summary)])
 
-	notify.push_message('AnyRouter Check-in Results', notify_content, msg_type='text')
+		print(notify_content)
+		notify.push_message('AnyRouter Check-in Alert', notify_content, msg_type='text')
+		print('[NOTIFY] Notification sent due to failures or balance changes')
+	else:
+		print('[INFO] All accounts successful and no balance changes detected, notification skipped')
 
 	# 设置退出码
 	sys.exit(0 if success_count > 0 else 1)