From 3a45253eb5beb5ace163498fbeda27848a3cd7d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=BE=E8=81=AA?= Date: Fri, 10 Nov 2023 13:43:27 +0800 Subject: [PATCH] fixing server crash caused by JSON parsing error --- .../websocket/bin/websocket-server-2pass.cpp | 67 ++++++++++--------- runtime/websocket/bin/websocket-server.cpp | 37 +++++----- 2 files changed, 57 insertions(+), 47 deletions(-) diff --git a/runtime/websocket/bin/websocket-server-2pass.cpp b/runtime/websocket/bin/websocket-server-2pass.cpp index b0d322c24..bd0c59008 100644 --- a/runtime/websocket/bin/websocket-server-2pass.cpp +++ b/runtime/websocket/bin/websocket-server-2pass.cpp @@ -336,6 +336,10 @@ void WebSocketServer::on_message(websocketpp::connection_hdl hdl, auto it_data = data_map.find(hdl); if (it_data != data_map.end()) { msg_data = it_data->second; + if(msg_data->msg["is_eof"]){ + lock.unlock(); + return; + } } else { lock.unlock(); return; @@ -363,7 +367,9 @@ void WebSocketServer::on_message(websocketpp::connection_hdl hdl, }catch (std::exception const &e) { LOG(ERROR)<msg["is_eof"]=true; + guard_decoder.unlock(); + return; } if (jsonresult.contains("wav_name")) { @@ -387,25 +393,22 @@ void WebSocketServer::on_message(websocketpp::connection_hdl hdl, nlohmann::json json_fst_hws; try{ json_fst_hws = nlohmann::json::parse(json_string); + if(json_fst_hws.type() == nlohmann::json::value_t::object){ + // fst + try{ + std::unordered_map client_hws_map = json_fst_hws; + merged_hws_map.insert(client_hws_map.begin(), client_hws_map.end()); + } catch (const std::exception& e) { + LOG(INFO) << e.what(); + } + } } catch (std::exception const &e) { LOG(ERROR)< client_hws_map = json_fst_hws; - merged_hws_map.insert(client_hws_map.begin(), client_hws_map.end()); - } catch (const std::exception& e) { - LOG(INFO) << e.what(); - } - }else{ // nn std::string client_nn_hws = jsonresult["hotwords"]; nn_hotwords += " " + client_nn_hws; - LOG(INFO) << "nn hotwords: " << client_nn_hws; + // LOG(INFO) << "nn hotwords: " << client_nn_hws; } } } @@ -448,8 +451,8 @@ void WebSocketServer::on_message(websocketpp::connection_hdl hdl, } LOG(INFO) << "jsonresult=" << jsonresult << ", msg_data->msg=" << msg_data->msg; - if (jsonresult["is_speaking"] == false || - jsonresult["is_finished"] == true) { + if ((jsonresult["is_speaking"] == false || + jsonresult["is_finished"] == true) && msg_data->msg["is_eof"] != true) { LOG(INFO) << "client done"; // if it is in final message, post the sample_data to decode @@ -500,21 +503,23 @@ void WebSocketServer::on_message(websocketpp::connection_hdl hdl, try{ // post to decode - std::vector> hotwords_embedding_(*(msg_data->hotwords_embedding)); - msg_data->strand_->post( - std::bind(&WebSocketServer::do_decoder, this, - std::move(subvector), std::move(hdl), - std::ref(msg_data->msg), - std::ref(*(punc_cache_p.get())), - std::move(hotwords_embedding_), - std::ref(*thread_lock_p), std::move(false), - msg_data->msg["wav_name"], - msg_data->msg["mode"], - msg_data->msg["itn"], - msg_data->msg["audio_fs"], - msg_data->msg["wav_format"], - std::ref(msg_data->tpass_online_handle))); - msg_data->msg["access_num"]=(int)(msg_data->msg["access_num"])+1; + if (msg_data->msg["is_eof"] != true) { + std::vector> hotwords_embedding_(*(msg_data->hotwords_embedding)); + msg_data->strand_->post( + std::bind(&WebSocketServer::do_decoder, this, + std::move(subvector), std::move(hdl), + std::ref(msg_data->msg), + std::ref(*(punc_cache_p.get())), + std::move(hotwords_embedding_), + std::ref(*thread_lock_p), std::move(false), + msg_data->msg["wav_name"], + msg_data->msg["mode"], + msg_data->msg["itn"], + msg_data->msg["audio_fs"], + msg_data->msg["wav_format"], + std::ref(msg_data->tpass_online_handle))); + msg_data->msg["access_num"]=(int)(msg_data->msg["access_num"])+1; + } } catch (std::exception const &e) { diff --git a/runtime/websocket/bin/websocket-server.cpp b/runtime/websocket/bin/websocket-server.cpp index eeeafb72e..6ba4537e1 100644 --- a/runtime/websocket/bin/websocket-server.cpp +++ b/runtime/websocket/bin/websocket-server.cpp @@ -146,6 +146,7 @@ void WebSocketServer::on_open(websocketpp::connection_hdl hdl) { data_msg->msg["itn"] = true; data_msg->msg["audio_fs"] = 16000; data_msg->msg["access_num"] = 0; // the number of access for this object, when it is 0, we can free it saftly + data_msg->msg["is_eof"]=false; FUNASR_DEC_HANDLE decoder_handle = FunASRWfstDecoderInit(asr_handle, ASR_OFFLINE, global_beam_, lattice_beam_, am_scale_); data_msg->decoder_handle = decoder_handle; @@ -250,6 +251,10 @@ void WebSocketServer::on_message(websocketpp::connection_hdl hdl, auto it_data = data_map.find(hdl); if (it_data != data_map.end()) { msg_data = it_data->second; + if(msg_data->msg["is_eof"]){ + lock.unlock(); + return; + } } else{ lock.unlock(); return; @@ -274,7 +279,9 @@ void WebSocketServer::on_message(websocketpp::connection_hdl hdl, }catch (std::exception const &e) { LOG(ERROR)<msg["is_eof"]=true; + guard_decoder.unlock(); + return; } if (jsonresult["wav_name"] != nullptr) { @@ -295,25 +302,22 @@ void WebSocketServer::on_message(websocketpp::connection_hdl hdl, nlohmann::json json_fst_hws; try{ json_fst_hws = nlohmann::json::parse(json_string); + if(json_fst_hws.type() == nlohmann::json::value_t::object){ + // fst + try{ + std::unordered_map client_hws_map = json_fst_hws; + merged_hws_map.insert(client_hws_map.begin(), client_hws_map.end()); + } catch (const std::exception& e) { + LOG(INFO) << e.what(); + } + } } catch (std::exception const &e) { LOG(ERROR)< client_hws_map = json_fst_hws; - merged_hws_map.insert(client_hws_map.begin(), client_hws_map.end()); - } catch (const std::exception& e) { - LOG(INFO) << e.what(); - } - }else{ // nn std::string client_nn_hws = jsonresult["hotwords"]; nn_hotwords += " " + client_nn_hws; - LOG(INFO) << "nn hotwords: " << client_nn_hws; + // LOG(INFO) << "nn hotwords: " << client_nn_hws; } } } @@ -338,8 +342,8 @@ void WebSocketServer::on_message(websocketpp::connection_hdl hdl, if (jsonresult.contains("itn")) { msg_data->msg["itn"] = jsonresult["itn"]; } - if (jsonresult["is_speaking"] == false || - jsonresult["is_finished"] == true) { + if ((jsonresult["is_speaking"] == false || + jsonresult["is_finished"] == true) && msg_data->msg["is_eof"] != true) { LOG(INFO) << "client done"; // for offline, send all receive data to decoder engine std::vector> hotwords_embedding_(*(msg_data->hotwords_embedding)); @@ -376,6 +380,7 @@ void WebSocketServer::on_message(websocketpp::connection_hdl hdl, default: break; } + guard_decoder.unlock(); } // init asr model