Merge pull request restsend#27 from yeoleobun/tencent_tts

Fix(tts): combine streaming and non streaming for tencent tts

Author: shenjinti

Cargo.toml

@@ -40,6 +40,7 @@ tokio-util = "0.7.16"
 tracing = "0.1.41"
 tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
 tracing-appender = "0.2"
+unic-emoji = "0.9.0"
 url = "2.5.4"
 uuid = { version = "1.18.0", features = ["v4"] }
 webrtc = "0.13.0"

src/media/engine.rs

@@ -14,7 +14,7 @@ use crate::{
     event::EventSender,
     synthesis::{
         AliyunTtsClient, SynthesisClient, SynthesisOption, SynthesisType,
-        TencentCloudStreamingTtsClient, TencentCloudTtsClient, VoiceApiTtsClient,
+         TencentCloudTtsClient, VoiceApiTtsClient,
     },
     transcription::{
         AliyunAsrClientBuilder, TencentCloudAsrClientBuilder, TranscriptionClient,
@@ -96,10 +96,6 @@ impl Default for StreamEngine {
         );
         engine.register_tts(SynthesisType::Aliyun, AliyunTtsClient::create);
         engine.register_tts(SynthesisType::TencentCloud, TencentCloudTtsClient::create);
-        engine.register_tts(
-            SynthesisType::TencentCloudStreaming,
-            TencentCloudStreamingTtsClient::create,
-        );
         engine.register_tts(SynthesisType::VoiceApi, VoiceApiTtsClient::create);
         engine
     }

src/synthesis/mod.rs

@@ -7,12 +7,11 @@ use tokio::sync::mpsc;
 use tokio_util::sync::CancellationToken;
 mod aliyun;
 mod tencent_cloud;
-mod tencent_cloud_streaming;
 mod voiceapi;
 
 pub use aliyun::AliyunTtsClient;
 pub use tencent_cloud::TencentCloudTtsClient;
-pub use tencent_cloud_streaming::TencentCloudStreamingTtsClient;
+// pub use tencent_cloud_streaming::TencentCloudStreamingTtsClient;
 pub use voiceapi::VoiceApiTtsClient;
 
 #[derive(Clone, Default)]
@@ -33,8 +32,6 @@ pub type SynthesisEventReceiver = mpsc::UnboundedReceiver<Result<SynthesisEvent>
 pub enum SynthesisType {
     #[serde(rename = "tencent")]
     TencentCloud,
-    #[serde(rename = "tencent_streaming")]
-    TencentCloudStreaming,
     #[serde(rename = "voiceapi")]
     VoiceApi,
     #[serde(rename = "aliyun")]
@@ -47,7 +44,6 @@ impl std::fmt::Display for SynthesisType {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
             SynthesisType::TencentCloud => write!(f, "tencent"),
-            SynthesisType::TencentCloudStreaming => write!(f, "tencent_streaming"),
             SynthesisType::VoiceApi => write!(f, "voiceapi"),
             SynthesisType::Aliyun => write!(f, "aliyun"),
             SynthesisType::Other(provider) => write!(f, "{}", provider),
@@ -65,7 +61,6 @@ impl<'de> Deserialize<'de> for SynthesisType {
             "tencent" => Ok(SynthesisType::TencentCloud),
             "voiceapi" => Ok(SynthesisType::VoiceApi),
             "aliyun" => Ok(SynthesisType::Aliyun),
-            "tencent_streaming" => Ok(SynthesisType::TencentCloudStreaming),
             _ => Ok(SynthesisType::Other(value)),
         }
     }
@@ -255,10 +250,6 @@ pub fn create_synthesis_client(option: SynthesisOption) -> Result<Box<dyn Synthe
             let client = TencentCloudTtsClient::new(option);
             Ok(Box::new(client))
         }
-        SynthesisType::TencentCloudStreaming => {
-            let client = TencentCloudStreamingTtsClient::new(option);
-            Ok(Box::new(client))
-        }
         SynthesisType::VoiceApi => {
             let client = VoiceApiTtsClient::new(option);
             Ok(Box::new(client))