DAP protocol fixes

Fixed issue with DAP client can not handle non valid UTF8 output generted by DAP server Signed-off-by: Eran Ifrah <[email protected]>
eranif · Dec 5, 2024 · 162a4d6 · 162a4d6
1 parent 98338bb
commit 162a4d6
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/CodeLiteIDE-macOS.workspace b/CodeLiteIDE-macOS.workspace
@@ -7,13 +7,13 @@
 			"file_extensions":	"*.cpp;*.c;*.txt;*.json;*.hpp;*.cc;*.cxx;*.xml;*.h;*.wxcp;*.xrc;*.py",
 			"excludeFilesPattern":	"*.o;*.pyc;*.obj;*.workspace;*.o.d;*.exe;*.dll;*.project",
 			"excludePaths":	"codelite-cli;codelite-icons;codelite-icons-dark;codelite-icons-fresh-farm;codelite-stdio;codelite_echo;codelite_launcher;codelite_make;bitmaps;bitmaps-dark;bitmaps-light;build-release;CallGraph",
-			"debugger":	"lldb-vscode"
+			"debugger":	"GNU gdb debugger"
 		}, {
 			"name":	"Release",
 			"targets":	[["Run CMake - Release", "mkdir -p build-release && cd build-release && cmake -DCMAKE_BUILD_TYPE=Release .. -Wno-dev"], ["build", "cd  build-release && make -j8 install"], ["clean", "cd  build-release && make -j8 clean"]],
 			"file_extensions":	"*.cpp;*.c;*.txt;*.json;*.hpp;*.cc;*.cxx;*.xml;*.h;*.wxcp;.*.xrc;*.cmake;*.rc;*.py",
 			"excludeFilesPattern":	"*.o;*.pyc;*.obj;*.workspace;*.o.d;*.exe;*.dll;*.project",
 			"excludePaths":	"codelite-cli;codelite-icons;codelite-icons-dark;codelite-icons-fresh-farm;codelite-stdio;codelite_echo;codelite_launcher;codelite_make;bitmaps;bitmaps-dark;bitmaps-light;build-release;CallGraph",
-			"debugger":	"lldb-vscode"
+			"debugger":	"GNU gdb debugger"
 		}]
 }
diff --git a/DebugAdapterClient/DebugAdapterClient.cpp b/DebugAdapterClient/DebugAdapterClient.cpp
@@ -114,14 +114,14 @@ class StdioTransport : public dap::Transport
      * @returns true on success, false in case of an error. True is also returned when timeout occurs, check the buffer
      * length if it is 0, timeout occurred
      */
-    bool Read(wxString& buffer, int msTimeout) override
+    bool Read(std::string& buffer, int msTimeout) override
     {
         if (wxThread::IsMain()) {
             LOG_ERROR(LOG) << "StdioTransport::Read is called from the main thread!" << endl;
             return false;
         }
 
-        wxString msg;
+        std::string msg;
         switch (m_dap_server->Queue().ReceiveTimeout(msTimeout, msg)) {
         case wxMSGQUEUE_NO_ERROR:
         case wxMSGQUEUE_TIMEOUT:
@@ -136,7 +136,7 @@ class StdioTransport : public dap::Transport
      * @brief send data over the network
      * @return number of bytes written
      */
-    size_t Send(const wxString& buffer) override
+    size_t Send(const std::string& buffer) override
     {
         if (!m_dap_server->Write(buffer)) {
             return 0;
@@ -1267,7 +1267,7 @@ void DebugAdapterClient::StartAndConnectToDapServer()
         // Using socket transport
         auto socket_transport = new dap::SocketTransport();
         LOG_DEBUG(LOG) << "Connecting to dap server:" << m_session.dap_server.GetConnectionString() << endl;
-        if (!socket_transport->Connect(m_session.dap_server.GetConnectionString(), 10)) {
+        if (!socket_transport->Connect(m_session.dap_server.GetConnectionString().ToStdString(), 10)) {
             wxMessageBox("Failed to connect to DAP server using socket", DAP_MESSAGE_BOX_TITLE,
                          wxICON_ERROR | wxOK | wxCENTRE);
             wxDELETE(socket_transport);
@@ -1315,7 +1315,7 @@ void DebugAdapterClient::OnProcessOutput(clProcessEvent& event)
 {
     event.Skip();
     if (m_dap_server && m_dap_server->IsRedirect()) {
-        m_dap_server->Queue().Post(event.GetOutput());
+        m_dap_server->Queue().Post(event.GetOutputRaw());
     }
 }
 

diff --git a/DebugAdapterClient/DebugAdapterClient.hpp b/DebugAdapterClient/DebugAdapterClient.hpp
@@ -70,7 +70,7 @@ struct DapProcess {
         }
     }
 
-    bool Write(const wxString& buffer)
+    bool Write(const std::string& buffer)
     {
         if (m_process) {
             return m_process->WriteRaw(buffer);
@@ -79,12 +79,12 @@ struct DapProcess {
     }
 
     bool IsRedirect() const { return m_process && m_process->IsRedirect(); }
-    wxMessageQueue<wxString>& Queue() { return m_readQueue; }
+    wxMessageQueue<std::string>& Queue() { return m_readQueue; }
     typedef std::shared_ptr<DapProcess> Ptr_t;
 
 private:
     IProcess::Ptr_t m_process = nullptr;
-    wxMessageQueue<wxString> m_readQueue;
+    wxMessageQueue<std::string> m_readQueue;
 };
 
 class DebugAdapterClient : public IPlugin

diff --git a/DebugAdapterClient/StdioTransport.cpp b/DebugAdapterClient/StdioTransport.cpp
@@ -4,14 +4,14 @@ dap::StdioTransport::StdioTransport() {}
 
 dap::StdioTransport::~StdioTransport() {}
 
-bool dap::StdioTransport::Read(wxString& buffer, int msTimeout)
+bool dap::StdioTransport::Read(std::string& buffer, int msTimeout)
 {
     wxUnusedVar(buffer);
     wxUnusedVar(msTimeout);
     return false;
 }
 
-size_t dap::StdioTransport::Send(const wxString& buffer)
+size_t dap::StdioTransport::Send(const std::string& buffer)
 {
     wxUnusedVar(buffer);
     return false;

diff --git a/DebugAdapterClient/StdioTransport.hpp b/DebugAdapterClient/StdioTransport.hpp
@@ -23,13 +23,13 @@ class StdioTransport : public dap::Transport
      * @returns true on success, false in case of an error. True is also returned when timeout occurs, The caller should
      * check the buffer length: if it is 0, than timeout occurred.
      */
-    bool Read(wxString& buffer, int msTimeout) override;
+    bool Read(std::string& buffer, int msTimeout) override;
 
     /**
      * @brief send data over the network
      * @return number of bytes written
      */
-    size_t Send(const wxString& buffer) override;
+    size_t Send(const std::string& buffer) override;
 };
 
 } // namespace dap

diff --git a/submodules/wxdap b/submodules/wxdap
+6 −0		.gitignore
+10 −8		dap/Client.cpp
+8 −8		dap/Client.hpp
+34 −26		dap/JsonRPC.cpp
+11 −11		dap/JsonRPC.hpp
+2 −2		dap/Process.hpp
+11 −10		dap/ServerProtocol.cpp
+29 −32		dap/Socket.cpp
+4 −4		dap/Socket.hpp
+74 −31		dap/StringUtils.cpp
+4 −0		dap/StringUtils.hpp
+3 −3		dap/UnixProcess.cpp
+2 −2		dap/UnixProcess.hpp
+1 −1		dap/dapcxx.project
+6 −0		dbgcli/MainFrame.cpp
+1 −1		dbgcli/dbgcli.project