fix websocket key, mv websocket into protocol, test=doc

speechx/examples/ds2_ol/websocket/path.sh

@@ -10,5 +10,5 @@ TOOLS_BIN=$SPEECHX_TOOLS/valgrind/install/bin
 
 export LC_AL=C
 
-SPEECHX_BIN=$SPEECHX_BUILD/websocket
+SPEECHX_BIN=$SPEECHX_BUILD/protocol/websocket
 export PATH=$PATH:$SPEECHX_BIN:$TOOLS_BIN

speechx/speechx/CMakeLists.txt

@@ -34,9 +34,9 @@ add_subdirectory(decoder)
 
 include_directories(
 ${CMAKE_CURRENT_SOURCE_DIR}
-${CMAKE_CURRENT_SOURCE_DIR}/websocket
+${CMAKE_CURRENT_SOURCE_DIR}/protocol
 )
-add_subdirectory(websocket)
+add_subdirectory(protocol)
 
 include_directories(
 ${CMAKE_CURRENT_SOURCE_DIR}

speechx/speechx/protocol/CMakeLists.txt

@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
+
+add_subdirectory(websocket)

speechx/speechx/protocol/websocket/websocket_client.cc

@@ -68,7 +68,7 @@ void WebSocketClient::ReadLoopFunc() {
                 result_ = obj["result"].as_string().c_str();
             }
             if (obj["type"] == "partial_result") {
-                partial_result_ = obj["partial_result"].as_string().c_str();
+                partial_result_ = obj["result"].as_string().c_str();
             }
             if (obj["type"] == "speech_end") {
                 done_ = true;

speechx/speechx/protocol/websocket/websocket_client.h

@@ -40,8 +40,8 @@ class WebSocketClient {
     void SendEndSignal();
     void SendDataEnd();
     bool Done() const { return done_; }
-    std::string GetResult() { return result_; }
-    std::string GetPartialResult() { return partial_result_; }
+    std::string GetResult() const { return result_; } 
+    std::string GetPartialResult() const { return partial_result_;}
 
   private:
     void Connect();

speechx/speechx/protocol/websocket/websocket_server.cc

@@ -78,7 +78,7 @@ void ConnectionHandler::OnSpeechData(const beast::flat_buffer& buffer) {
     std::string partial_result = recognizer_->GetPartialResult();
     
     json::value rv = {
-        {"status", "ok"}, {"type", "partial_result"}, {"partial_result", partial_result}};
+        {"status", "ok"}, {"type", "partial_result"}, {"result", partial_result}};
     ws_.text(true);
     ws_.write(asio::buffer(json::serialize(rv)));
 }