add code merge from test-clean

talkingq-url/handlers/audio_file_handler.py

@@ -1,36 +1,19 @@
-import os
-import uuid
-from config import settings
+from banban.service.message_audio_storage import MessageAudioStorageService
 from utils.logger import session_logger
-# from utils.audio_denoiser import reduce_background_noise
+
+
+message_audio_storage_service = MessageAudioStorageService()
 
 
 async def save_audio_file(audio_data: bytes, device_id: str) -> str:
-    """
-    保存音频数据到 assets/audio 目录
-    
-    Args:
-        audio_data: 音频二进制数据
-        device_id: 设备ID
-        
-    Returns:
-        音频文件的相对路径
-    """
+    """Upload device audio to COS and return its object key."""
     try:
-        audio_dir = os.path.join(settings.assets_dir, "audio")
-        os.makedirs(audio_dir, exist_ok=True)
-        
-        filename = f"{device_id}_{uuid.uuid4().hex[:8]}.mp3"
-        filepath = os.path.join(audio_dir, filename)
-        
-        with open(filepath, 'wb') as f:
-            f.write(audio_data)
-        
-        # relative_path = f"assets/audio/{filename}"
-        session_logger.info(device_id, "audio", f"音频文件已保存: {filepath}")
-        
-        # reduce_background_noise(filepath, relative_path,noise_path='assets/audio/noise_sample.wav',normalize_volume=True)
-        return filepath
+        stored = await message_audio_storage_service.upload_audio(
+            device_id=device_id,
+            content=audio_data,
+        )
+        session_logger.info(device_id, "audio", f"audio uploaded to COS: {stored.file_key}")
+        return stored.file_key
     except Exception as e:
-        session_logger.error(device_id, "audio", f"保存音频文件时出错: {e}", exc_info=True)
-        raise
+        session_logger.error(device_id, "audio", f"failed to store audio: {e}", exc_info=True)
+        raise

talkingq-url/handlers/mqtt_handler.py

@@ -3,6 +3,7 @@ import time
 import asyncio
 from typing import Optional, Dict, Callable, Awaitable
 from banban.service.device_setting import device_setting_service
+from banban.service.binding import BindingService
 from config import settings
 from services.card_service import card_service
 from services.offline_audio_cache import offline_audio_cache
@@ -166,8 +167,13 @@ class TalkingQMQTTService:
 
         nfc_uuid = params.get("uuid")
         # 卡片与设备绑定
-        await card_service.activate_card(device_id=device_id, card_uuid=nfc_uuid)
-        logger.info(device_id, "", f"[NFC绑定] 设备 {device_id} 请求绑定卡片, UUID={nfc_uuid}")
+        # await card_service.activate_card(device_id=device_id, card_uuid=nfc_uuid)
+        service = BindingService()
+        result = await service.finalize_nfc_bind(device_id=device_id, card_uuid=nfc_uuid)
+        if result is None:
+            logger.warning(device_id, "", "[NFC bind] no pending bind session found")
+            return
+        logger.info(device_id, "", f"[NFC绑定] 设备 {device_id} 请求绑定卡片, UUID={nfc_uuid}, result={result}")
 
     async def _handle_open_response(self, device_id: str, payload: dict):
         params = payload.get("params", {})