web: remove doc_root / -dir static file serving

Assets are now embedded in the binary, so the on-disk fallback path
and the doc_root parameter threaded through Listener → DetectSession →
HttpSession → handle_request are dead code.  Remove them and deprecate
the -dir flag in the Tcl command.  Also tighten -web_port parsing with
std::from_chars and range validation.

Signed-off-by: Matt Liberty <mliberty@precisioninno.com>

Author: maliberty

src/Main.cc

@@ -5,6 +5,7 @@
 #include <strings.h>
 
 #include <array>
+#include <charconv>
 #include <climits>
 #include <clocale>
 #include <csignal>
@@ -397,8 +398,17 @@ static int tclAppInit(int& argc,
     // Start the web server before sourcing the script so the user can
     // watch execution in real-time (analogous to -gui).
     if (web_enabled) {
-      int port = web_port_arg ? std::atoi(web_port_arg) : 0;
-      ord::OpenRoad::openRoad()->getWebServer()->serve(port, "");
+      int port = 0;
+      if (web_port_arg) {
+        const char* end = web_port_arg + std::strlen(web_port_arg);
+        auto [ptr, ec] = std::from_chars(web_port_arg, end, port);
+        if (ec != std::errc{} || ptr != end || port < 0 || port > 65535) {
+          fprintf(
+              stderr, "Error: invalid -web_port value '%s'\n", web_port_arg);
+          exit(EXIT_FAILURE);
+        }
+      }
+      ord::OpenRoad::openRoad()->getWebServer()->serve(port);
     }
 
     // gui::Gui::enabled() is true when a HeadlessViewer is installed

src/web/include/web/web.h

@@ -53,7 +53,6 @@ ListenerHandle createAndRunListener(
     std::shared_ptr<TclEvaluator> tcl_eval,
     std::shared_ptr<TimingReport> timing_report,
     std::shared_ptr<ClockTreeReport> clock_report,
-    const std::string& doc_root,
     utl::Logger* logger,
     WebViewerHook* viewer_hook);
 
@@ -74,7 +73,7 @@ class WebServer
   // Start the web server on the given port.  Launches background
   // I/O threads and returns immediately.  A second call is a no-op if
   // the server is already running.
-  void serve(int port, const std::string& doc_root);
+  void serve(int port);
 
   // True after serve() returns and before stop/destructor.
   bool isRunning() const { return ioc_ != nullptr; }

src/web/src/web.cpp

@@ -10,11 +10,9 @@
 #include <cstdlib>
 #include <cstring>
 #include <deque>
-#include <filesystem>
 #include <fstream>
 #include <functional>
 #include <ios>
-#include <iterator>
 #include <limits>
 #include <memory>
 #include <mutex>
@@ -225,31 +223,9 @@ static std::vector<unsigned char> serialize_response(
 // HTTP request handler (wraps dispatch_request for HTTP transport)
 //------------------------------------------------------------------------------
 
-static std::string content_type_for(const std::string& path)
-{
-  auto ext = std::filesystem::path(path).extension().string();
-  if (ext == ".html") {
-    return "text/html";
-  }
-  if (ext == ".js") {
-    return "application/javascript";
-  }
-  if (ext == ".css") {
-    return "text/css";
-  }
-  if (ext == ".png") {
-    return "image/png";
-  }
-  if (ext == ".json") {
-    return "application/json";
-  }
-  return "application/octet-stream";
-}
-
 static http::response<http::string_body> handle_request(
     http::request<http::string_body>&& req,
-    const TileGenerator& generator,
-    const std::string& doc_root)
+    const TileGenerator& generator)
 {
   http::response<http::string_body> res{http::status::ok, req.version()};
   res.set(http::field::server, "Boost.Beast Server (C++17)");
@@ -297,24 +273,10 @@ static http::response<http::string_body> handle_request(
     if (file_path == "/") {
       file_path = "/index.html";
     }
-    // Try embedded assets first (compiled into the binary).
     const auto* asset = findEmbeddedAsset(file_path);
     if (asset) {
       res.set(http::field::content_type, asset->content_type);
       res.body() = std::string(asset->content());
-    } else if (!doc_root.empty() && file_path.find("..") == std::string::npos) {
-      // Fall back to on-disk files for development override.
-      auto full_path = std::filesystem::path(doc_root) / file_path.substr(1);
-      std::ifstream file(full_path, std::ios::binary);
-      if (file) {
-        std::string content((std::istreambuf_iterator<char>(file)),
-                            std::istreambuf_iterator<char>());
-        res.set(http::field::content_type, content_type_for(file_path));
-        res.body() = std::move(content);
-      } else {
-        res.result(http::status::not_found);
-        res.body() = "File not found.";
-      }
     } else {
       res.result(http::status::not_found);
       res.body() = "Resource not found.";
@@ -864,13 +826,11 @@ class HttpSession : public std::enable_shared_from_this<HttpSession>
   std::shared_ptr<TileGenerator> generator_;
   std::shared_ptr<http::response<http::string_body>> res_;
   http::request<http::string_body> req_;
-  std::string doc_root_;
   utl::Logger* logger_;
 
  public:
   HttpSession(Tcp::socket&& socket,
               std::shared_ptr<TileGenerator> generator,
-              std::string doc_root,
               utl::Logger* logger);
 
   void run() { do_read(); }
@@ -888,11 +848,9 @@ class HttpSession : public std::enable_shared_from_this<HttpSession>
 
 HttpSession::HttpSession(Tcp::socket&& socket,
                          std::shared_ptr<TileGenerator> generator,
-                         std::string doc_root,
                          utl::Logger* logger)
     : stream_(std::move(socket)),
       generator_(std::move(generator)),
-      doc_root_(std::move(doc_root)),
       logger_(logger)
 {
 }
@@ -930,7 +888,7 @@ void HttpSession::on_read(beast::error_code ec)
   }
 
   res_ = std::make_shared<http::response<http::string_body>>(
-      handle_request(std::move(req_), *generator_, doc_root_));
+      handle_request(std::move(req_), *generator_));
   do_write();
 }
 
@@ -981,7 +939,6 @@ class DetectSession : public std::enable_shared_from_this<DetectSession>
   std::shared_ptr<TimingReport> timing_report_;
   std::shared_ptr<ClockTreeReport> clock_report_;
   http::request<http::string_body> req_;
-  std::string doc_root_;
   utl::Logger* logger_;
   WebViewerHook* viewer_hook_ = nullptr;
 
@@ -991,7 +948,6 @@ class DetectSession : public std::enable_shared_from_this<DetectSession>
                 std::shared_ptr<TclEvaluator> tcl_eval,
                 std::shared_ptr<TimingReport> timing_report,
                 std::shared_ptr<ClockTreeReport> clock_report,
-                std::string doc_root,
                 utl::Logger* logger,
                 WebViewerHook* viewer_hook);
 
@@ -1006,15 +962,13 @@ DetectSession::DetectSession(Tcp::socket&& socket,
                              std::shared_ptr<TclEvaluator> tcl_eval,
                              std::shared_ptr<TimingReport> timing_report,
                              std::shared_ptr<ClockTreeReport> clock_report,
-                             std::string doc_root,
                              utl::Logger* logger,
                              WebViewerHook* viewer_hook)
     : stream_(std::move(socket)),
       generator_(std::move(generator)),
       tcl_eval_(std::move(tcl_eval)),
       timing_report_(std::move(timing_report)),
       clock_report_(std::move(clock_report)),
-      doc_root_(std::move(doc_root)),
       logger_(logger),
       viewer_hook_(viewer_hook)
 {
@@ -1053,7 +1007,7 @@ void DetectSession::on_read(beast::error_code ec)
   } else {
     // Regular HTTP - hand off to session with already-read request
     auto s = std::make_shared<HttpSession>(
-        stream_.release_socket(), generator_, doc_root_, logger_);
+        stream_.release_socket(), generator_, logger_);
     s->run_with_request(std::move(req_), std::move(buffer_));
   }
 }
@@ -1070,7 +1024,6 @@ class Listener : public std::enable_shared_from_this<Listener>
   std::shared_ptr<TclEvaluator> tcl_eval_;
   std::shared_ptr<TimingReport> timing_report_;
   std::shared_ptr<ClockTreeReport> clock_report_;
-  std::string doc_root_;
   utl::Logger* logger_;
   WebViewerHook* viewer_hook_ = nullptr;
 
@@ -1081,7 +1034,6 @@ class Listener : public std::enable_shared_from_this<Listener>
            std::shared_ptr<TclEvaluator> tcl_eval,
            std::shared_ptr<TimingReport> timing_report,
            std::shared_ptr<ClockTreeReport> clock_report,
-           std::string doc_root,
            utl::Logger* logger,
            WebViewerHook* viewer_hook);
 
@@ -1110,7 +1062,6 @@ Listener::Listener(net::io_context& ioc,
                    std::shared_ptr<TclEvaluator> tcl_eval,
                    std::shared_ptr<TimingReport> timing_report,
                    std::shared_ptr<ClockTreeReport> clock_report,
-                   std::string doc_root,
                    utl::Logger* logger,
                    WebViewerHook* viewer_hook)
     : ioc_(ioc),
@@ -1119,7 +1070,6 @@ Listener::Listener(net::io_context& ioc,
       tcl_eval_(std::move(tcl_eval)),
       timing_report_(std::move(timing_report)),
       clock_report_(std::move(clock_report)),
-      doc_root_(std::move(doc_root)),
       logger_(logger),
       viewer_hook_(viewer_hook)
 {
@@ -1171,7 +1121,6 @@ void Listener::on_accept(beast::error_code ec, Tcp::socket socket)
                                     tcl_eval_,
                                     timing_report_,
                                     clock_report_,
-                                    doc_root_,
                                     logger_,
                                     viewer_hook_)
         ->run();
@@ -1529,7 +1478,6 @@ ListenerHandle createAndRunListener(
     std::shared_ptr<TclEvaluator> tcl_eval,
     std::shared_ptr<TimingReport> timing_report,
     std::shared_ptr<ClockTreeReport> clock_report,
-    const std::string& doc_root,
     utl::Logger* logger,
     WebViewerHook* viewer_hook)
 {
@@ -1539,7 +1487,6 @@ ListenerHandle createAndRunListener(
                                              std::move(tcl_eval),
                                              std::move(timing_report),
                                              std::move(clock_report),
-                                             doc_root,
                                              logger,
                                              viewer_hook);
   listener->run();

src/web/src/web.i

@@ -13,10 +13,10 @@
 namespace web {
 
 void
-web_server_cmd(int port, const char* doc_root)
+web_server_cmd(int port)
 {
   web::WebServer *server = ord::OpenRoad::openRoad()->getWebServer();
-  server->serve(port, doc_root);
+  server->serve(port);
 }
 
 void

src/web/src/web.tcl

@@ -19,12 +19,11 @@ proc web_server { args } {
     set port $keys(-port)
   }
 
-  set dir ""
   if { [info exists keys(-dir)] } {
-    set dir $keys(-dir)
+    utl::warn WEB 37 "-dir is deprecated and ignored; assets are embedded in the binary."
   }
 
-  web::web_server_cmd $port $dir
+  web::web_server_cmd $port
   web::web_server_wait_cmd
 }
 

src/web/src/web_serve.cpp

@@ -102,7 +102,7 @@ class WebLogSink : public spdlog::sinks::base_sink<std::mutex>
   std::string pending_;
 };
 
-void WebServer::serve(int port, const std::string& doc_root)
+void WebServer::serve(int port)
 {
   if (ioc_) {
     logger_->warn(utl::WEB, 6, "Web server is already running.");
@@ -165,10 +165,6 @@ void WebServer::serve(int port, const std::string& doc_root)
     uint16_t const u_port = port;
     int const num_threads = num_threads_;
 
-    if (!doc_root.empty()) {
-      logger_->info(utl::WEB, 4, "Serving static files from {}", doc_root);
-    }
-
     ioc_ = std::make_unique<net::io_context>(num_threads);
 
     auto handle = createAndRunListener(*ioc_,
@@ -177,7 +173,6 @@ void WebServer::serve(int port, const std::string& doc_root)
                                        tcl_eval,
                                        timing_report,
                                        clock_report,
-                                       doc_root,
                                        logger_,
                                        viewer_hook_.get());
     shutdown_listener_ = std::move(handle.shutdown);