修复设备给家长留言音频云存储链路

talkingq-url/handlers/websocket_message_handler.py

@@ -4,7 +4,7 @@ import asyncio
 from fastapi import WebSocket
 from handlers.audio_packet_parser import parse_packet
 from handlers.audio_session_handler import handle_websocket_data
-from handlers.audio_file_handler import message_audio_storage_service, save_audio_file
+from handlers.audio_file_handler import message_audio_storage_service, save_audio_file, upload_message_audio
 from services.audio_session import audio_session_manager
 from services.interrupt_handler import interrupt_handler
 from services.task_manager import task_manager
@@ -19,8 +19,19 @@ from handlers.prompt_sound_handler import handle_prompt_sound_request
 from handlers.session_cleanup_handler import handle_old_session_cleanup
 from config import settings
 from banban.service.im import im_service as im_conversation_service
+from utils.audio_format import detect_audio_format, wrap_pcm_as_wav
 from fastapi import HTTPException
 
+
+def prepare_message_audio(audio_data: bytes) -> tuple[bytes, str, str, str]:
+    source_format = detect_audio_format(audio_data)
+    if source_format == "wav":
+        return audio_data, "audio/wav", "wav", source_format
+    if source_format == "mp3":
+        return audio_data, "audio/mpeg", "mp3", source_format
+    return wrap_pcm_as_wav(audio_data), "audio/wav", "wav", source_format
+
+
 async def handle_websocket_messages(websocket: WebSocket, device_id: str, serial_number: str):
     """
     处理WebSocket连接中的所有消息
@@ -266,16 +277,30 @@ async def process_parent_leave_message(device_id: str, audio_cache_key: str):
             session_logger.info(device_id, "parent", "发给家长的留言没有缓存音频数据")
             return
 
-        audio_file_key = await save_audio_file(cached_audio, device_id)
-        audio_url = f"http://{settings.server_host}:{settings.server_port}/{audio_file_key}"
+        archive_audio, media_mime_type, extension, source_format = prepare_message_audio(cached_audio)
+        stored_audio = await upload_message_audio(
+            archive_audio,
+            device_id,
+            content_type=media_mime_type,
+            extension=extension,
+        )
         await im_conversation_service.create_device_parent_leave_message(
             device_id=device_id,
-            media_file_key=audio_url,
-            media_mime_type="audio/mpeg",
-            media_size_bytes=len(cached_audio),
-            ext_json={"source": "device_ws_parent_leave_message"},
+            media_file_key=stored_audio.file_key,
+            media_mime_type=media_mime_type,
+            media_size_bytes=len(archive_audio),
+            ext_json={
+                "source": "device_ws_parent_leave_message",
+                "storage": "cos",
+                "source_format": source_format,
+                "archive_format": extension,
+            },
+        )
+        session_logger.info(
+            device_id,
+            "parent",
+            f"发给家长的留言已上传COS并写入家长会话: {stored_audio.file_key}",
         )
-        session_logger.info(device_id, "parent", "发给家长的留言已写入家长会话")
 
         websocket = await connection_manager.get_connection(device_id)
         if websocket and websocket.client_state.name == "CONNECTED":