Revert "[lldb] NFC Moving mcp::Transport into its own file. (llvm#155711)"

This reverts commit 71a065e.

(cherry picked from commit 1bb8db5)

Author: sylvestre

lldb/include/lldb/Protocol/MCP/MCPError.h

@@ -19,7 +19,7 @@ class MCPError : public llvm::ErrorInfo<MCPError> {
 public:
   static char ID;
 
-  MCPError(std::string message, int64_t error_code = eErrorCodeInternalError);
+  MCPError(std::string message, int64_t error_code = kInternalError);
 
   void log(llvm::raw_ostream &OS) const override;
   std::error_code convertToErrorCode() const override;
@@ -28,6 +28,9 @@ class MCPError : public llvm::ErrorInfo<MCPError> {
 
   lldb_protocol::mcp::Error toProtocolError() const;
 
+  static constexpr int64_t kResourceNotFound = -32002;
+  static constexpr int64_t kInternalError = -32603;
+
 private:
   std::string m_message;
   int64_t m_error_code;

lldb/include/lldb/Protocol/MCP/Protocol.h

@@ -55,11 +55,6 @@ enum ErrorCode : signed {
   eErrorCodeInvalidParams = -32602,
   /// Internal JSON-RPC error.
   eErrorCodeInternalError = -32603,
-
-  /// Additional MCP error codes.
-
-  /// Resource related uri not found.
-  eErrorCodeResourceNotFound = -32002,
 };
 
 struct Error {

lldb/include/lldb/Protocol/MCP/Server.h

@@ -9,20 +9,43 @@
 #ifndef LLDB_PROTOCOL_MCP_SERVER_H
 #define LLDB_PROTOCOL_MCP_SERVER_H
 
+#include "lldb/Host/JSONTransport.h"
 #include "lldb/Host/MainLoop.h"
 #include "lldb/Protocol/MCP/Protocol.h"
 #include "lldb/Protocol/MCP/Resource.h"
 #include "lldb/Protocol/MCP/Tool.h"
-#include "lldb/Protocol/MCP/Transport.h"
 #include "llvm/ADT/StringMap.h"
 #include "llvm/Support/Error.h"
+#include <mutex>
 
 namespace lldb_protocol::mcp {
 
-class Server : public Transport::MessageHandler {
+class MCPTransport
+    : public lldb_private::JSONRPCTransport<Request, Response, Notification> {
+public:
+  using LogCallback = std::function<void(llvm::StringRef message)>;
+
+  MCPTransport(lldb::IOObjectSP in, lldb::IOObjectSP out,
+               std::string client_name, LogCallback log_callback = {})
+      : JSONRPCTransport(in, out), m_client_name(std::move(client_name)),
+        m_log_callback(log_callback) {}
+  virtual ~MCPTransport() = default;
+
+  void Log(llvm::StringRef message) override {
+    if (m_log_callback)
+      m_log_callback(llvm::formatv("{0}: {1}", m_client_name, message).str());
+  }
+
+private:
+  std::string m_client_name;
+  LogCallback m_log_callback;
+};
+
+class Server : public MCPTransport::MessageHandler {
 public:
   Server(std::string name, std::string version,
-         std::unique_ptr<Transport> transport_up, lldb_private::MainLoop &loop);
+         std::unique_ptr<MCPTransport> transport_up,
+         lldb_private::MainLoop &loop);
   ~Server() = default;
 
   using NotificationHandler = std::function<void(const Notification &)>;
@@ -69,7 +92,7 @@ class Server : public Transport::MessageHandler {
   const std::string m_name;
   const std::string m_version;
 
-  std::unique_ptr<Transport> m_transport_up;
+  std::unique_ptr<MCPTransport> m_transport_up;
   lldb_private::MainLoop &m_loop;
 
   llvm::StringMap<std::unique_ptr<Tool>> m_tools;

lldb/include/lldb/Protocol/MCP/Transport.h

@@ -67,7 +67,7 @@ void ProtocolServerMCP::AcceptCallback(std::unique_ptr<Socket> socket) {
   LLDB_LOG(log, "New MCP client connected: {0}", client_name);
 
   lldb::IOObjectSP io_sp = std::move(socket);
-  auto transport_up = std::make_unique<lldb_protocol::mcp::Transport>(
+  auto transport_up = std::make_unique<lldb_protocol::mcp::MCPTransport>(
       io_sp, io_sp, std::move(client_name), [&](llvm::StringRef message) {
         LLDB_LOG(GetLog(LLDBLog::Host), "{0}", message);
       });

lldb/source/Plugins/Protocol/MCP/ProtocolServerMCP.cpp

@@ -3,7 +3,6 @@ add_lldb_library(lldbProtocolMCP NO_PLUGIN_DEPENDENCIES
   Protocol.cpp
   Server.cpp
   Tool.cpp
-  Transport.cpp
 
   LINK_COMPONENTS
     Support

lldb/source/Protocol/MCP/CMakeLists.txt

@@ -15,7 +15,7 @@ using namespace lldb_protocol::mcp;
 using namespace llvm;
 
 Server::Server(std::string name, std::string version,
-               std::unique_ptr<Transport> transport_up,
+               std::unique_ptr<MCPTransport> transport_up,
                lldb_private::MainLoop &loop)
     : m_name(std::move(name)), m_version(std::move(version)),
       m_transport_up(std::move(transport_up)), m_loop(loop) {
@@ -180,7 +180,7 @@ llvm::Expected<Response> Server::ResourcesReadHandler(const Request &request) {
 
   return make_error<MCPError>(
       llvm::formatv("no resource handler for uri: {0}", uri_str).str(),
-      eErrorCodeResourceNotFound);
+      MCPError::kResourceNotFound);
 }
 
 ServerCapabilities Server::GetCapabilities() {
@@ -219,7 +219,7 @@ void Server::Received(const Request &request) {
       response.takeError(),
       [&](const MCPError &err) { protocol_error = err.toProtocolError(); },
       [&](const llvm::ErrorInfoBase &err) {
-        protocol_error.code = eErrorCodeInternalError;
+        protocol_error.code = MCPError::kInternalError;
         protocol_error.message = err.message();
       });
   Response error_response;

lldb/source/Protocol/MCP/Server.cpp

@@ -21,7 +21,6 @@
 #include "lldb/Protocol/MCP/Resource.h"
 #include "lldb/Protocol/MCP/Server.h"
 #include "lldb/Protocol/MCP/Tool.h"
-#include "lldb/Protocol/MCP/Transport.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/Error.h"
 #include "llvm/Support/JSON.h"
@@ -37,12 +36,12 @@ using namespace lldb_private;
 using namespace lldb_protocol::mcp;
 
 namespace {
-class TestMCPTransport final : public lldb_protocol::mcp::Transport {
+class TestMCPTransport final : public MCPTransport {
 public:
   TestMCPTransport(lldb::IOObjectSP in, lldb::IOObjectSP out)
-      : lldb_protocol::mcp::Transport(in, out, "unittest") {}
+      : lldb_protocol::mcp::MCPTransport(in, out, "unittest") {}
 
-  using Transport::Write;
+  using MCPTransport::Write;
 
   void Log(llvm::StringRef message) override {
     log_messages.emplace_back(message);