From 29482e00f01cc3ace7374813a9b1871b31bc762a Mon Sep 17 00:00:00 2001
From: smatsuodev <git@smatsuo.dev>
Date: Wed, 20 Aug 2025 13:28:27 +0900
Subject: [PATCH 1/8] wip

---
 src/CMakeLists.txt                            |  2 +
 src/lib/core/action/run_cgi_action.cpp        |  4 +-
 src/lib/core/handler/read_request_handler.cpp |  3 +
 src/lib/core/server.cpp                       | 85 +++++++++++++++++++
 src/lib/core/server.hpp                       |  6 ++
 src/lib/core/server_state.cpp                 |  8 ++
 src/lib/core/server_state.hpp                 |  4 +
 src/lib/event/event_notifier.cpp              |  8 +-
 src/lib/event/event_notifier.hpp              |  6 +-
 src/lib/transport/connection.cpp              | 11 ++-
 src/lib/transport/connection.hpp              |  4 +
 src/lib/utils/time.cpp                        | 13 +++
 src/lib/utils/time.hpp                        | 16 ++++
 13 files changed, 161 insertions(+), 9 deletions(-)
 create mode 100644 src/lib/utils/time.cpp
 create mode 100644 src/lib/utils/time.hpp

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 91e05b7d..ea8788b7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -18,6 +18,8 @@ add_library(webserv_lib STATIC
         lib/utils/logger.hpp
         lib/utils/string.cpp
         lib/utils/string.hpp
+        lib/utils/time.cpp
+        lib/utils/time.hpp
         lib/utils/types/option.hpp
         lib/utils/types/result.hpp
         lib/utils/types/unit.hpp
diff --git a/src/lib/core/action/run_cgi_action.cpp b/src/lib/core/action/run_cgi_action.cpp
index cb675768..8c8dbc2a 100644
--- a/src/lib/core/action/run_cgi_action.cpp
+++ b/src/lib/core/action/run_cgi_action.cpp
@@ -8,6 +8,7 @@
 #include "core/handler/write_cgi_request_handler.hpp"
 #include "../../cgi/meta_variable.hpp"
 #include "utils/fd.hpp"
+#include "utils/time.hpp"
 #include "utils/logger.hpp"
 
 void RunCgiAction::execute(ActionContext &ctx) {
@@ -134,5 +135,6 @@ void RunCgiAction::parentRoutine(const ActionContext &ctx, const int socketFd, c
     ctx.getState().getEventNotifier().unregisterEvent(Event(clientFd_, Event::kWrite));
     ctx.getState().getEventHandlerRepository().remove(clientFd_, Event::kRead);
     ctx.getState().getEventHandlerRepository().remove(clientFd_, Event::kWrite);
-    ctx.getState().getCgiProcessRepository().set(childPid, {clientFd_, socketFd});
+    CgiProcessRepository::Data data = {clientFd_, socketFd, utils::Time::getCurrentTime()};
+    ctx.getState().getCgiProcessRepository().set(childPid, data);
 }
diff --git a/src/lib/core/handler/read_request_handler.cpp b/src/lib/core/handler/read_request_handler.cpp
index e23dc99f..32153a8f 100644
--- a/src/lib/core/handler/read_request_handler.cpp
+++ b/src/lib/core/handler/read_request_handler.cpp
@@ -15,6 +15,9 @@ ReadRequestHandler::ReadRequestHandler(const VirtualServerResolver &vsResolver)
 IEventHandler::InvokeResult ReadRequestHandler::invoke(const Context &ctx) {
     LOG_DEBUG("start ReadRequestHandler");
 
+    // アクティビティを更新
+    ctx.getConnection().unwrap().get().updateActivity();
+    
     ReadBuffer &readBuf = ctx.getConnection().unwrap().get().getReadBuffer();
     const Option<http::Request> req = TRY(reqReader_.readRequest(readBuf));
     if (req.isNone()) {
diff --git a/src/lib/core/server.cpp b/src/lib/core/server.cpp
index c2bab85c..578dd768 100644
--- a/src/lib/core/server.cpp
+++ b/src/lib/core/server.cpp
@@ -6,7 +6,10 @@
 #include "http/response/response_builder.hpp"
 #include "transport/listener.hpp"
 #include "utils/logger.hpp"
+#include "utils/time.hpp"
 #include <map>
+#include <signal.h>
+#include <cstring>
 
 Server::Server(const config::Config &config) : config_(config) {
     const config::ServerContextList &servers = config_.getServers();
@@ -109,6 +112,9 @@ void Server::start() {
 
             invokeHandlers(ctx);
         }
+        
+        // タイムアウトチェック
+        checkTimeouts();
     }
 }
 
@@ -210,3 +216,82 @@ void Server::executeActions(ActionContext &actionCtx, std::vector<IAction *> act
         delete action;
     }
 }
+
+void Server::checkTimeouts() {
+    checkRequestTimeouts();
+    checkCgiTimeouts();
+}
+
+void Server::checkRequestTimeouts() {
+    const std::time_t currentTime = utils::Time::getCurrentTime();
+    const std::map<int, Connection *> connections = state_.getConnectionRepository().getAllConnections();
+    
+    for (std::map<int, Connection *>::const_iterator it = connections.begin(); it != connections.end(); ++it) {
+        const int fd = it->first;
+        Connection *conn = it->second;
+        
+        // Listener の fd はスキップ
+        if (listenerFds_.count(fd) > 0) {
+            continue;
+        }
+        
+        // Read ハンドラーが登録されているかチェック（リクエスト待ち状態）
+        const Option<Ref<IEventHandler> > readHandler = state_.getEventHandlerRepository().get(fd, Event::kRead);
+        if (readHandler.isNone()) {
+            continue;
+        }
+        
+        const double elapsed = utils::Time::diffTimeSeconds(currentTime, conn->getLastActivityTime());
+        if (elapsed > REQUEST_TIMEOUT_SECONDS) {
+            LOG_INFOF("Request timeout for fd %d (elapsed: %.0f seconds)", fd, elapsed);
+            
+            // タイムアウトレスポンスを設定
+            http::ResponseBuilder builder;
+            http::Response response = builder.status(http::kStatusRequestTimeout).build();
+            
+            // Read ハンドラーを削除し、Write ハンドラーを設定
+            state_.getEventNotifier().unregisterEvent(Event(fd, Event::kRead));
+            state_.getEventHandlerRepository().remove(fd, Event::kRead);
+            state_.getEventNotifier().registerEvent(Event(fd, Event::kWrite));
+            state_.getEventHandlerRepository().set(fd, Event::kWrite, new WriteResponseHandler(response));
+        }
+    }
+}
+
+void Server::checkCgiTimeouts() {
+    const std::time_t currentTime = utils::Time::getCurrentTime();
+    const std::map<pid_t, CgiProcessRepository::Data> processes = state_.getCgiProcessRepository().getAllProcesses();
+    
+    for (std::map<pid_t, CgiProcessRepository::Data>::const_iterator it = processes.begin(); 
+         it != processes.end(); ++it) {
+        const pid_t pid = it->first;
+        const CgiProcessRepository::Data &data = it->second;
+        
+        const double elapsed = utils::Time::diffTimeSeconds(currentTime, data.startTime);
+        if (elapsed > CGI_TIMEOUT_SECONDS) {
+            LOG_INFOF("CGI timeout for pid %d (elapsed: %.0f seconds)", pid, elapsed);
+            
+            // CGI プロセスを強制終了
+            if (kill(pid, SIGKILL) == -1) {
+                LOG_WARNF("Failed to kill CGI process %d: %s", pid, std::strerror(errno));
+            }
+            
+            // プロセスソケットをクリーンアップ
+            const int processSocketFd = data.processSocketFd;
+            const int clientFd = data.clientFd;
+            
+            state_.getEventNotifier().unregisterEvent(Event(processSocketFd, Event::kRead));
+            state_.getEventNotifier().unregisterEvent(Event(processSocketFd, Event::kWrite));
+            state_.getEventHandlerRepository().remove(processSocketFd, Event::kRead);
+            state_.getEventHandlerRepository().remove(processSocketFd, Event::kWrite);
+            state_.getConnectionRepository().remove(processSocketFd);
+            state_.getCgiProcessRepository().remove(pid);
+            
+            // Gateway Timeout レスポンスを返す
+            http::ResponseBuilder builder;
+            http::Response response = builder.status(http::kStatusGatewayTimeout).build();
+            state_.getEventNotifier().registerEvent(Event(clientFd, Event::kWrite));
+            state_.getEventHandlerRepository().set(clientFd, Event::kWrite, new WriteResponseHandler(response));
+        }
+    }
+}
diff --git a/src/lib/core/server.hpp b/src/lib/core/server.hpp
index 9b85d5ab..d0b963eb 100644
--- a/src/lib/core/server.hpp
+++ b/src/lib/core/server.hpp
@@ -19,6 +19,9 @@ class Server {
     // VirtualServer は http::Router を持っていて、コピー不可なのでポインタで持つ
     typedef std::vector<VirtualServer *> VirtualServerList;
 
+    static const int REQUEST_TIMEOUT_SECONDS = 5;
+    static const int CGI_TIMEOUT_SECONDS = 5;
+
     config::Config config_;
     VirtualServerList virtualServers_;
 
@@ -32,6 +35,9 @@ class Server {
     static void executeActions(ActionContext &actionCtx, std::vector<IAction *> actions);
     void invokeHandlers(const Context &ctx);
     void invokeSingleHandler(const Context &ctx, const Ref<IEventHandler> &handler, bool shouldCallHandler);
+    void checkTimeouts();
+    void checkRequestTimeouts();
+    void checkCgiTimeouts();
 };
 
 #endif
diff --git a/src/lib/core/server_state.cpp b/src/lib/core/server_state.cpp
index 9897b990..b62ebd0f 100644
--- a/src/lib/core/server_state.cpp
+++ b/src/lib/core/server_state.cpp
@@ -45,6 +45,10 @@ void ConnectionRepository::remove(const int fd) {
     LOG_DEBUGF("connection removed from server");
 }
 
+std::map<int, Connection *> ConnectionRepository::getAllConnections() const {
+    return connections_;
+}
+
 EventHandlerRepository::EventHandlerRepository() {}
 
 EventHandlerRepository::~EventHandlerRepository() {
@@ -104,6 +108,10 @@ void CgiProcessRepository::remove(const pid_t pid) {
     pidToData_.erase(pid);
 }
 
+std::map<pid_t, CgiProcessRepository::Data> CgiProcessRepository::getAllProcesses() const {
+    return pidToData_;
+}
+
 ServerState::ServerState() {
     // self-pipe の読み端を監視対象にする
     reaper_.attachToEventNotifier(&getEventNotifier());
diff --git a/src/lib/core/server_state.hpp b/src/lib/core/server_state.hpp
index 61b35020..3bb7ac5b 100644
--- a/src/lib/core/server_state.hpp
+++ b/src/lib/core/server_state.hpp
@@ -7,6 +7,7 @@
 #include "transport/connection.hpp"
 #include "utils/types/option.hpp"
 #include <map>
+#include <ctime>
 
 // TODO: 共通化するべき?
 
@@ -22,6 +23,7 @@ class ConnectionRepository : public NonCopyable {
      */
     void set(int fd, Connection *conn);
     void remove(int fd);
+    std::map<int, Connection *> getAllConnections() const;
 
 private:
     std::map<int, Connection *> connections_;
@@ -48,6 +50,7 @@ class CgiProcessRepository : public NonCopyable {
     struct Data {
         int clientFd;
         int processSocketFd;
+        std::time_t startTime;
     };
 
     CgiProcessRepository() {}
@@ -55,6 +58,7 @@ class CgiProcessRepository : public NonCopyable {
     Option<Data> get(pid_t pid);
     void set(pid_t pid, Data data);
     void remove(pid_t pid);
+    std::map<pid_t, Data> getAllProcesses() const;
 
 private:
     std::map<pid_t, Data> pidToData_;
diff --git a/src/lib/event/event_notifier.cpp b/src/lib/event/event_notifier.cpp
index e4991c9a..5049f301 100644
--- a/src/lib/event/event_notifier.cpp
+++ b/src/lib/event/event_notifier.cpp
@@ -72,9 +72,9 @@ void EpollEventNotifier::unregisterEvent(const Event &event) {
     }
 }
 
-EpollEventNotifier::WaitEventsResult EpollEventNotifier::waitEvents() {
+EpollEventNotifier::WaitEventsResult EpollEventNotifier::waitEvents(int timeoutMs) {
     epoll_event evs[1024];
-    const int numEvents = epoll_wait(epollFd_.get(), evs, 1024, -1);
+    const int numEvents = epoll_wait(epollFd_.get(), evs, 1024, timeoutMs);
     if (numEvents == -1) {
         LOG_ERRORF("epoll_wait failed: %s", std::strerror(errno));
         return Err(error::kUnknown);
@@ -160,7 +160,7 @@ void PollEventNotifier::unregisterEvent(const Event &event) {
     }
 }
 
-IEventNotifier::WaitEventsResult PollEventNotifier::waitEvents() {
+IEventNotifier::WaitEventsResult PollEventNotifier::waitEvents(int timeoutMs) {
     std::vector<pollfd> fds;
     for (EventMap::const_iterator it = registeredEvents_.begin(); it != registeredEvents_.end(); ++it) {
         pollfd pfd = {};
@@ -169,7 +169,7 @@ IEventNotifier::WaitEventsResult PollEventNotifier::waitEvents() {
         fds.push_back(pfd);
     }
 
-    const int result = poll(fds.data(), fds.size(), -1);
+    const int result = poll(fds.data(), fds.size(), timeoutMs);
     if (result == -1) {
         LOG_ERRORF("poll failed: %s", std::strerror(errno));
         return Err(error::kUnknown);
diff --git a/src/lib/event/event_notifier.hpp b/src/lib/event/event_notifier.hpp
index 25802ff1..43927add 100644
--- a/src/lib/event/event_notifier.hpp
+++ b/src/lib/event/event_notifier.hpp
@@ -19,7 +19,7 @@ class IEventNotifier {
     virtual void unregisterEvent(const Event &event) = 0;
 
     typedef Result<std::vector<Event>, error::AppError> WaitEventsResult;
-    virtual WaitEventsResult waitEvents() = 0;
+    virtual WaitEventsResult waitEvents(int timeoutMs = 1000) = 0;
 };
 
 // epoll の抽象
@@ -29,7 +29,7 @@ class EpollEventNotifier : public IEventNotifier {
 
     void registerEvent(const Event &event);
     void unregisterEvent(const Event &event);
-    WaitEventsResult waitEvents();
+    WaitEventsResult waitEvents(int timeoutMs = 1000);
 
 private:
     AutoFd epollFd_;
@@ -46,7 +46,7 @@ class PollEventNotifier : public IEventNotifier {
 
     void registerEvent(const Event &event);
     void unregisterEvent(const Event &event);
-    WaitEventsResult waitEvents();
+    WaitEventsResult waitEvents(int timeoutMs = 1000);
 
 private:
     typedef std::map<int, Event> EventMap;
diff --git a/src/lib/transport/connection.cpp b/src/lib/transport/connection.cpp
index ee166444..9e82cbc4 100644
--- a/src/lib/transport/connection.cpp
+++ b/src/lib/transport/connection.cpp
@@ -1,9 +1,10 @@
 #include "connection.hpp"
 #include "utils/logger.hpp"
+#include "utils/time.hpp"
 
 Connection::Connection(const int fd, const Address &localAddress, const Address &foreignAddress)
     : clientFd_(fd), localAddress_(localAddress), foreignAddress_(foreignAddress), fdReader_(clientFd_),
-      buffer_(fdReader_) {}
+      buffer_(fdReader_), lastActivityTime_(utils::Time::getCurrentTime()) {}
 
 Connection::~Connection() {
     LOG_DEBUG("Connection: destruct");
@@ -24,3 +25,11 @@ const Address &Connection::getForeignAddress() const {
 ReadBuffer &Connection::getReadBuffer() {
     return buffer_;
 }
+
+std::time_t Connection::getLastActivityTime() const {
+    return lastActivityTime_;
+}
+
+void Connection::updateActivity() {
+    lastActivityTime_ = utils::Time::getCurrentTime();
+}
diff --git a/src/lib/transport/connection.hpp b/src/lib/transport/connection.hpp
index 363ced85..a0067928 100644
--- a/src/lib/transport/connection.hpp
+++ b/src/lib/transport/connection.hpp
@@ -5,6 +5,7 @@
 #include "utils/auto_fd.hpp"
 #include "utils/io/read_buffer.hpp"
 #include "utils/io/reader.hpp"
+#include <ctime>
 
 // クライアントソケットの抽象
 class Connection {
@@ -16,6 +17,8 @@ class Connection {
     const Address &getLocalAddress() const;
     const Address &getForeignAddress() const;
     ReadBuffer &getReadBuffer();
+    std::time_t getLastActivityTime() const;
+    void updateActivity();
 
 private:
     AutoFd clientFd_;
@@ -23,6 +26,7 @@ class Connection {
     Address foreignAddress_;
     io::FdReader fdReader_; // ReadBuffer に渡す IReader & の参照先として必要
     ReadBuffer buffer_;
+    std::time_t lastActivityTime_;
 };
 
 #endif
diff --git a/src/lib/utils/time.cpp b/src/lib/utils/time.cpp
new file mode 100644
index 00000000..f7cf8f64
--- /dev/null
+++ b/src/lib/utils/time.cpp
@@ -0,0 +1,13 @@
+#include "time.hpp"
+
+namespace utils {
+
+std::time_t Time::getCurrentTime() {
+    return std::time(NULL);
+}
+
+double Time::diffTimeSeconds(std::time_t end, std::time_t start) {
+    return std::difftime(end, start);
+}
+
+}
\ No newline at end of file
diff --git a/src/lib/utils/time.hpp b/src/lib/utils/time.hpp
new file mode 100644
index 00000000..7fda74e0
--- /dev/null
+++ b/src/lib/utils/time.hpp
@@ -0,0 +1,16 @@
+#ifndef TIME_HPP
+#define TIME_HPP
+
+#include <ctime>
+
+namespace utils {
+
+    class Time {
+    public:
+        static std::time_t getCurrentTime();
+        static double diffTimeSeconds(std::time_t end, std::time_t start);
+    };
+
+}
+
+#endif

From cc7fd46f16a61d9784df42d398b7bc06882a7e4a Mon Sep 17 00:00:00 2001
From: smatsuodev <git@smatsuo.dev>
Date: Fri, 22 Aug 2025 16:30:38 +0900
Subject: [PATCH 2/8] =?UTF-8?q?server=5Fstate.cpp=E3=81=8B=E3=82=89?=
 =?UTF-8?q?=E3=82=BF=E3=82=A4=E3=83=A0=E3=82=A2=E3=82=A6=E3=83=88=E3=81=97?=
 =?UTF-8?q?=E3=81=9Ffd=E3=82=92=E5=8F=96=E5=BE=97=E3=81=99=E3=82=8B?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E3=83=AA=E3=83=95=E3=82=A1=E3=82=AF?=
 =?UTF-8?q?=E3=82=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/vcs.xml                 |   3 +
 src/lib/core/server.cpp       | 106 ++++++++++++++++------------------
 src/lib/core/server_state.cpp |  50 ++++++++++++++--
 src/lib/core/server_state.hpp |  17 +++++-
 4 files changed, 113 insertions(+), 63 deletions(-)

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 35eb1ddf..72cefee0 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,5 +2,8 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/dist/_deps/fakeit-src" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/dist/_deps/fakeit-src/docs" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/dist/_deps/googletest-src" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/lib/core/server.cpp b/src/lib/core/server.cpp
index 578dd768..ce20dcb0 100644
--- a/src/lib/core/server.cpp
+++ b/src/lib/core/server.cpp
@@ -112,7 +112,7 @@ void Server::start() {
 
             invokeHandlers(ctx);
         }
-        
+
         // タイムアウトチェック
         checkTimeouts();
     }
@@ -224,74 +224,66 @@ void Server::checkTimeouts() {
 
 void Server::checkRequestTimeouts() {
     const std::time_t currentTime = utils::Time::getCurrentTime();
-    const std::map<int, Connection *> connections = state_.getConnectionRepository().getAllConnections();
-    
-    for (std::map<int, Connection *>::const_iterator it = connections.begin(); it != connections.end(); ++it) {
-        const int fd = it->first;
-        Connection *conn = it->second;
-        
-        // Listener の fd はスキップ
-        if (listenerFds_.count(fd) > 0) {
-            continue;
-        }
-        
+
+    const std::vector<int> timedOutFds =
+        state_.getConnectionRepository().getTimedOutConnectionFds(currentTime, REQUEST_TIMEOUT_SECONDS, listenerFds_);
+
+    for (std::vector<int>::const_iterator it = timedOutFds.begin(); it != timedOutFds.end(); ++it) {
+        const int fd = *it;
+
         // Read ハンドラーが登録されているかチェック（リクエスト待ち状態）
         const Option<Ref<IEventHandler> > readHandler = state_.getEventHandlerRepository().get(fd, Event::kRead);
         if (readHandler.isNone()) {
             continue;
         }
-        
-        const double elapsed = utils::Time::diffTimeSeconds(currentTime, conn->getLastActivityTime());
-        if (elapsed > REQUEST_TIMEOUT_SECONDS) {
-            LOG_INFOF("Request timeout for fd %d (elapsed: %.0f seconds)", fd, elapsed);
-            
-            // タイムアウトレスポンスを設定
-            http::ResponseBuilder builder;
-            http::Response response = builder.status(http::kStatusRequestTimeout).build();
-            
-            // Read ハンドラーを削除し、Write ハンドラーを設定
-            state_.getEventNotifier().unregisterEvent(Event(fd, Event::kRead));
-            state_.getEventHandlerRepository().remove(fd, Event::kRead);
-            state_.getEventNotifier().registerEvent(Event(fd, Event::kWrite));
-            state_.getEventHandlerRepository().set(fd, Event::kWrite, new WriteResponseHandler(response));
-        }
+
+        LOG_INFOF("Request timeout for fd %d", fd);
+
+        // タイムアウトレスポンスを設定
+        http::ResponseBuilder builder;
+        http::Response response = builder.status(http::kStatusRequestTimeout).build();
+
+        // Read ハンドラーを削除し、Write ハンドラーを設定
+        state_.getEventNotifier().unregisterEvent(Event(fd, Event::kRead));
+        state_.getEventHandlerRepository().remove(fd, Event::kRead);
+        state_.getEventNotifier().registerEvent(Event(fd, Event::kWrite));
+        state_.getEventHandlerRepository().set(fd, Event::kWrite, new WriteResponseHandler(response));
     }
 }
 
 void Server::checkCgiTimeouts() {
     const std::time_t currentTime = utils::Time::getCurrentTime();
-    const std::map<pid_t, CgiProcessRepository::Data> processes = state_.getCgiProcessRepository().getAllProcesses();
-    
-    for (std::map<pid_t, CgiProcessRepository::Data>::const_iterator it = processes.begin(); 
-         it != processes.end(); ++it) {
+    const std::vector<std::pair<pid_t, CgiProcessRepository::Data> > timedOutProcesses =
+        state_.getCgiProcessRepository().getTimedOutProcesses(currentTime, CGI_TIMEOUT_SECONDS);
+
+    for (std::vector<std::pair<pid_t, CgiProcessRepository::Data> >::const_iterator it = timedOutProcesses.begin();
+         it != timedOutProcesses.end();
+         ++it) {
         const pid_t pid = it->first;
         const CgiProcessRepository::Data &data = it->second;
-        
-        const double elapsed = utils::Time::diffTimeSeconds(currentTime, data.startTime);
-        if (elapsed > CGI_TIMEOUT_SECONDS) {
-            LOG_INFOF("CGI timeout for pid %d (elapsed: %.0f seconds)", pid, elapsed);
-            
-            // CGI プロセスを強制終了
-            if (kill(pid, SIGKILL) == -1) {
-                LOG_WARNF("Failed to kill CGI process %d: %s", pid, std::strerror(errno));
-            }
-            
-            // プロセスソケットをクリーンアップ
-            const int processSocketFd = data.processSocketFd;
-            const int clientFd = data.clientFd;
-            
-            state_.getEventNotifier().unregisterEvent(Event(processSocketFd, Event::kRead));
-            state_.getEventNotifier().unregisterEvent(Event(processSocketFd, Event::kWrite));
-            state_.getEventHandlerRepository().remove(processSocketFd, Event::kRead);
-            state_.getEventHandlerRepository().remove(processSocketFd, Event::kWrite);
-            state_.getConnectionRepository().remove(processSocketFd);
-            state_.getCgiProcessRepository().remove(pid);
-            
-            // Gateway Timeout レスポンスを返す
-            http::ResponseBuilder builder;
-            http::Response response = builder.status(http::kStatusGatewayTimeout).build();
-            state_.getEventNotifier().registerEvent(Event(clientFd, Event::kWrite));
-            state_.getEventHandlerRepository().set(clientFd, Event::kWrite, new WriteResponseHandler(response));
+
+        LOG_INFOF("CGI timeout for pid %d", pid);
+
+        // CGI プロセスを強制終了
+        if (kill(pid, SIGKILL) == -1) {
+            LOG_WARNF("Failed to kill CGI process %d: %s", pid, std::strerror(errno));
         }
+
+        // プロセスソケットをクリーンアップ
+        const int processSocketFd = data.processSocketFd;
+        const int clientFd = data.clientFd;
+
+        state_.getEventNotifier().unregisterEvent(Event(processSocketFd, Event::kRead));
+        state_.getEventNotifier().unregisterEvent(Event(processSocketFd, Event::kWrite));
+        state_.getEventHandlerRepository().remove(processSocketFd, Event::kRead);
+        state_.getEventHandlerRepository().remove(processSocketFd, Event::kWrite);
+        state_.getConnectionRepository().remove(processSocketFd);
+        state_.getCgiProcessRepository().remove(pid);
+
+        // Gateway Timeout レスポンスを返す
+        http::ResponseBuilder builder;
+        http::Response response = builder.status(http::kStatusGatewayTimeout).build();
+        state_.getEventNotifier().registerEvent(Event(clientFd, Event::kWrite));
+        state_.getEventHandlerRepository().set(clientFd, Event::kWrite, new WriteResponseHandler(response));
     }
 }
diff --git a/src/lib/core/server_state.cpp b/src/lib/core/server_state.cpp
index b62ebd0f..3499d878 100644
--- a/src/lib/core/server_state.cpp
+++ b/src/lib/core/server_state.cpp
@@ -1,6 +1,9 @@
 #include "server_state.hpp"
 #include "utils/logger.hpp"
 #include "utils/ref.hpp"
+#include "utils/time.hpp"
+#include <vector>
+#include <set>
 
 ConnectionRepository::ConnectionRepository() {}
 
@@ -45,8 +48,31 @@ void ConnectionRepository::remove(const int fd) {
     LOG_DEBUGF("connection removed from server");
 }
 
-std::map<int, Connection *> ConnectionRepository::getAllConnections() const {
-    return connections_;
+std::vector<int> ConnectionRepository::getTimedOutConnectionFds(
+    std::time_t currentTime,
+    double timeoutSeconds,
+    const std::set<int>& excludeFds
+) const {
+    std::vector<int> timedOutFds;
+    
+    for (std::map<int, Connection *>::const_iterator it = connections_.begin(); 
+         it != connections_.end(); ++it) {
+        const int fd = it->first;
+        Connection *conn = it->second;
+        
+        // 除外リストに含まれるFDはスキップ
+        if (excludeFds.count(fd) > 0) {
+            continue;
+        }
+        
+        // タイムアウトチェック
+        const double elapsed = utils::Time::diffTimeSeconds(currentTime, conn->getLastActivityTime());
+        if (elapsed > timeoutSeconds) {
+            timedOutFds.push_back(fd);
+        }
+    }
+    
+    return timedOutFds;
 }
 
 EventHandlerRepository::EventHandlerRepository() {}
@@ -108,8 +134,24 @@ void CgiProcessRepository::remove(const pid_t pid) {
     pidToData_.erase(pid);
 }
 
-std::map<pid_t, CgiProcessRepository::Data> CgiProcessRepository::getAllProcesses() const {
-    return pidToData_;
+std::vector<std::pair<pid_t, CgiProcessRepository::Data> > CgiProcessRepository::getTimedOutProcesses(
+    std::time_t currentTime,
+    double timeoutSeconds
+) const {
+    std::vector<std::pair<pid_t, CgiProcessRepository::Data> > timedOutProcesses;
+    
+    for (std::map<pid_t, Data>::const_iterator it = pidToData_.begin(); 
+         it != pidToData_.end(); ++it) {
+        const pid_t pid = it->first;
+        const Data &data = it->second;
+        
+        const double elapsed = utils::Time::diffTimeSeconds(currentTime, data.startTime);
+        if (elapsed > timeoutSeconds) {
+            timedOutProcesses.push_back(std::make_pair(pid, data));
+        }
+    }
+    
+    return timedOutProcesses;
 }
 
 ServerState::ServerState() {
diff --git a/src/lib/core/server_state.hpp b/src/lib/core/server_state.hpp
index 3bb7ac5b..76e5e6fa 100644
--- a/src/lib/core/server_state.hpp
+++ b/src/lib/core/server_state.hpp
@@ -7,6 +7,8 @@
 #include "transport/connection.hpp"
 #include "utils/types/option.hpp"
 #include <map>
+#include <set>
+#include <vector>
 #include <ctime>
 
 // TODO: 共通化するべき?
@@ -23,7 +25,13 @@ class ConnectionRepository : public NonCopyable {
      */
     void set(int fd, Connection *conn);
     void remove(int fd);
-    std::map<int, Connection *> getAllConnections() const;
+    
+    // タイムアウトしたコネクションのFDを取得
+    std::vector<int> getTimedOutConnectionFds(
+        std::time_t currentTime,
+        double timeoutSeconds,
+        const std::set<int>& excludeFds
+    ) const;
 
 private:
     std::map<int, Connection *> connections_;
@@ -58,7 +66,12 @@ class CgiProcessRepository : public NonCopyable {
     Option<Data> get(pid_t pid);
     void set(pid_t pid, Data data);
     void remove(pid_t pid);
-    std::map<pid_t, Data> getAllProcesses() const;
+    
+    // タイムアウトしたプロセスを取得
+    std::vector<std::pair<pid_t, Data> > getTimedOutProcesses(
+        std::time_t currentTime,
+        double timeoutSeconds
+    ) const;
 
 private:
     std::map<pid_t, Data> pidToData_;

From 5d186d4b8695ebea71ddfe7dbc41975ae276f328 Mon Sep 17 00:00:00 2001
From: smatsuodev <git@smatsuo.dev>
Date: Fri, 22 Aug 2025 16:31:37 +0900
Subject: [PATCH 3/8] format

---
 src/lib/core/handler/read_request_handler.cpp |  2 +-
 src/lib/core/server_state.cpp                 | 30 ++++++++-----------
 src/lib/core/server_state.hpp                 | 16 ++++------
 src/lib/utils/time.cpp                        | 14 ++++-----
 4 files changed, 25 insertions(+), 37 deletions(-)

diff --git a/src/lib/core/handler/read_request_handler.cpp b/src/lib/core/handler/read_request_handler.cpp
index 32153a8f..0853ae5d 100644
--- a/src/lib/core/handler/read_request_handler.cpp
+++ b/src/lib/core/handler/read_request_handler.cpp
@@ -17,7 +17,7 @@ IEventHandler::InvokeResult ReadRequestHandler::invoke(const Context &ctx) {
 
     // アクティビティを更新
     ctx.getConnection().unwrap().get().updateActivity();
-    
+
     ReadBuffer &readBuf = ctx.getConnection().unwrap().get().getReadBuffer();
     const Option<http::Request> req = TRY(reqReader_.readRequest(readBuf));
     if (req.isNone()) {
diff --git a/src/lib/core/server_state.cpp b/src/lib/core/server_state.cpp
index 3499d878..61234d56 100644
--- a/src/lib/core/server_state.cpp
+++ b/src/lib/core/server_state.cpp
@@ -49,29 +49,26 @@ void ConnectionRepository::remove(const int fd) {
 }
 
 std::vector<int> ConnectionRepository::getTimedOutConnectionFds(
-    std::time_t currentTime,
-    double timeoutSeconds,
-    const std::set<int>& excludeFds
+    std::time_t currentTime, double timeoutSeconds, const std::set<int> &excludeFds
 ) const {
     std::vector<int> timedOutFds;
-    
-    for (std::map<int, Connection *>::const_iterator it = connections_.begin(); 
-         it != connections_.end(); ++it) {
+
+    for (std::map<int, Connection *>::const_iterator it = connections_.begin(); it != connections_.end(); ++it) {
         const int fd = it->first;
         Connection *conn = it->second;
-        
+
         // 除外リストに含まれるFDはスキップ
         if (excludeFds.count(fd) > 0) {
             continue;
         }
-        
+
         // タイムアウトチェック
         const double elapsed = utils::Time::diffTimeSeconds(currentTime, conn->getLastActivityTime());
         if (elapsed > timeoutSeconds) {
             timedOutFds.push_back(fd);
         }
     }
-    
+
     return timedOutFds;
 }
 
@@ -134,23 +131,20 @@ void CgiProcessRepository::remove(const pid_t pid) {
     pidToData_.erase(pid);
 }
 
-std::vector<std::pair<pid_t, CgiProcessRepository::Data> > CgiProcessRepository::getTimedOutProcesses(
-    std::time_t currentTime,
-    double timeoutSeconds
-) const {
+std::vector<std::pair<pid_t, CgiProcessRepository::Data> >
+CgiProcessRepository::getTimedOutProcesses(std::time_t currentTime, double timeoutSeconds) const {
     std::vector<std::pair<pid_t, CgiProcessRepository::Data> > timedOutProcesses;
-    
-    for (std::map<pid_t, Data>::const_iterator it = pidToData_.begin(); 
-         it != pidToData_.end(); ++it) {
+
+    for (std::map<pid_t, Data>::const_iterator it = pidToData_.begin(); it != pidToData_.end(); ++it) {
         const pid_t pid = it->first;
         const Data &data = it->second;
-        
+
         const double elapsed = utils::Time::diffTimeSeconds(currentTime, data.startTime);
         if (elapsed > timeoutSeconds) {
             timedOutProcesses.push_back(std::make_pair(pid, data));
         }
     }
-    
+
     return timedOutProcesses;
 }
 
diff --git a/src/lib/core/server_state.hpp b/src/lib/core/server_state.hpp
index 76e5e6fa..49573142 100644
--- a/src/lib/core/server_state.hpp
+++ b/src/lib/core/server_state.hpp
@@ -25,13 +25,10 @@ class ConnectionRepository : public NonCopyable {
      */
     void set(int fd, Connection *conn);
     void remove(int fd);
-    
+
     // タイムアウトしたコネクションのFDを取得
-    std::vector<int> getTimedOutConnectionFds(
-        std::time_t currentTime,
-        double timeoutSeconds,
-        const std::set<int>& excludeFds
-    ) const;
+    std::vector<int>
+    getTimedOutConnectionFds(std::time_t currentTime, double timeoutSeconds, const std::set<int> &excludeFds) const;
 
 private:
     std::map<int, Connection *> connections_;
@@ -66,12 +63,9 @@ class CgiProcessRepository : public NonCopyable {
     Option<Data> get(pid_t pid);
     void set(pid_t pid, Data data);
     void remove(pid_t pid);
-    
+
     // タイムアウトしたプロセスを取得
-    std::vector<std::pair<pid_t, Data> > getTimedOutProcesses(
-        std::time_t currentTime,
-        double timeoutSeconds
-    ) const;
+    std::vector<std::pair<pid_t, Data> > getTimedOutProcesses(std::time_t currentTime, double timeoutSeconds) const;
 
 private:
     std::map<pid_t, Data> pidToData_;
diff --git a/src/lib/utils/time.cpp b/src/lib/utils/time.cpp
index f7cf8f64..72acd99e 100644
--- a/src/lib/utils/time.cpp
+++ b/src/lib/utils/time.cpp
@@ -2,12 +2,12 @@
 
 namespace utils {
 
-std::time_t Time::getCurrentTime() {
-    return std::time(NULL);
-}
+    std::time_t Time::getCurrentTime() {
+        return std::time(NULL);
+    }
 
-double Time::diffTimeSeconds(std::time_t end, std::time_t start) {
-    return std::difftime(end, start);
-}
+    double Time::diffTimeSeconds(std::time_t end, std::time_t start) {
+        return std::difftime(end, start);
+    }
 
-}
\ No newline at end of file
+}

From 810d3a0d7f011162eb5aa43bb9553bf6b6b66100 Mon Sep 17 00:00:00 2001
From: smatsuodev <git@smatsuo.dev>
Date: Fri, 22 Aug 2025 16:32:56 +0900
Subject: [PATCH 4/8] rename

---
 src/lib/core/server.cpp | 12 ++++++------
 src/lib/core/server.hpp |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/lib/core/server.cpp b/src/lib/core/server.cpp
index ce20dcb0..9f7287bf 100644
--- a/src/lib/core/server.cpp
+++ b/src/lib/core/server.cpp
@@ -114,7 +114,7 @@ void Server::start() {
         }
 
         // タイムアウトチェック
-        checkTimeouts();
+        removeTimeoutHandlers();
     }
 }
 
@@ -217,12 +217,12 @@ void Server::executeActions(ActionContext &actionCtx, std::vector<IAction *> act
     }
 }
 
-void Server::checkTimeouts() {
-    checkRequestTimeouts();
-    checkCgiTimeouts();
+void Server::removeTimeoutHandlers() {
+    removeTimeoutRequestHandlers();
+    removeTimeoutCgiProcesses();
 }
 
-void Server::checkRequestTimeouts() {
+void Server::removeTimeoutRequestHandlers() {
     const std::time_t currentTime = utils::Time::getCurrentTime();
 
     const std::vector<int> timedOutFds =
@@ -251,7 +251,7 @@ void Server::checkRequestTimeouts() {
     }
 }
 
-void Server::checkCgiTimeouts() {
+void Server::removeTimeoutCgiProcesses() {
     const std::time_t currentTime = utils::Time::getCurrentTime();
     const std::vector<std::pair<pid_t, CgiProcessRepository::Data> > timedOutProcesses =
         state_.getCgiProcessRepository().getTimedOutProcesses(currentTime, CGI_TIMEOUT_SECONDS);
diff --git a/src/lib/core/server.hpp b/src/lib/core/server.hpp
index d0b963eb..c8bbb604 100644
--- a/src/lib/core/server.hpp
+++ b/src/lib/core/server.hpp
@@ -35,9 +35,9 @@ class Server {
     static void executeActions(ActionContext &actionCtx, std::vector<IAction *> actions);
     void invokeHandlers(const Context &ctx);
     void invokeSingleHandler(const Context &ctx, const Ref<IEventHandler> &handler, bool shouldCallHandler);
-    void checkTimeouts();
-    void checkRequestTimeouts();
-    void checkCgiTimeouts();
+    void removeTimeoutHandlers();
+    void removeTimeoutRequestHandlers();
+    void removeTimeoutCgiProcesses();
 };
 
 #endif

From 2ce0e0d974db68ec25e5619336515a4fbc8b720b Mon Sep 17 00:00:00 2001
From: smatsuodev <git@smatsuo.dev>
Date: Fri, 22 Aug 2025 16:51:19 +0900
Subject: [PATCH 5/8] =?UTF-8?q?timeout=E3=81=99=E3=82=8BCGI=E3=82=92?=
 =?UTF-8?q?=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 example/cgi/timeout.cgi | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100755 example/cgi/timeout.cgi

diff --git a/example/cgi/timeout.cgi b/example/cgi/timeout.cgi
new file mode 100755
index 00000000..7017f8ae
--- /dev/null
+++ b/example/cgi/timeout.cgi
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# HTTP Header
+echo "Content-Type: text/html"
+sleep 10
+echo ""
+
+# HTML Content
+echo "<html>"
+echo "<head><title>CGI Test</title></head>"
+echo "<body>"
+echo "<h1>Hello, CGI!</h1>"
+echo "<p>This page was generated by a Shell script.</p>"
+echo "</body>"
+echo "</html>"
\ No newline at end of file

From 7b0e3ef74a20cd9f5d46de4bb35eac5ce260fa89 Mon Sep 17 00:00:00 2001
From: Kentaro Mizuki <66548698+harsssh@users.noreply.github.com>
Date: Sun, 24 Aug 2025 14:51:14 +0900
Subject: [PATCH 6/8] use SIGTERM

---
 src/lib/core/server.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/core/server.cpp b/src/lib/core/server.cpp
index 9f7287bf..72fe0d2f 100644
--- a/src/lib/core/server.cpp
+++ b/src/lib/core/server.cpp
@@ -265,7 +265,7 @@ void Server::removeTimeoutCgiProcesses() {
         LOG_INFOF("CGI timeout for pid %d", pid);
 
         // CGI プロセスを強制終了
-        if (kill(pid, SIGKILL) == -1) {
+        if (kill(pid, SIGTERM) == -1) {
             LOG_WARNF("Failed to kill CGI process %d: %s", pid, std::strerror(errno));
         }
 

From 00c3722d9e12b0c4d7158e5ad1b47ec473c6152c Mon Sep 17 00:00:00 2001
From: Kentaro Mizuki <66548698+harsssh@users.noreply.github.com>
Date: Sun, 24 Aug 2025 14:52:09 +0900
Subject: [PATCH 7/8] chore

---
 src/lib/core/server.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/core/server.cpp b/src/lib/core/server.cpp
index 72fe0d2f..cefcfb58 100644
--- a/src/lib/core/server.cpp
+++ b/src/lib/core/server.cpp
@@ -266,7 +266,7 @@ void Server::removeTimeoutCgiProcesses() {
 
         // CGI プロセスを強制終了
         if (kill(pid, SIGTERM) == -1) {
-            LOG_WARNF("Failed to kill CGI process %d: %s", pid, std::strerror(errno));
+            LOG_WARNF("Failed to terminate CGI process %d: %s", pid, std::strerror(errno));
         }
 
         // プロセスソケットをクリーンアップ

From 5ebd17e1f6924be53f5d12f3eca4792a52b913d3 Mon Sep 17 00:00:00 2001
From: Kentaro Mizuki <66548698+harsssh@users.noreply.github.com>
Date: Sun, 24 Aug 2025 15:10:58 +0900
Subject: [PATCH 8/8] =?UTF-8?q?=E5=AD=90=E3=83=97=E3=83=AD=E3=82=BB?=
 =?UTF-8?q?=E3=82=B9=E3=82=92=E5=9B=9E=E5=8F=8E=E3=81=97=E3=81=9F=E3=82=89?=
 =?UTF-8?q?=20map=20=E3=81=8B=E3=82=89=E6=B6=88=E3=81=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lib/core/server.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/lib/core/server.cpp b/src/lib/core/server.cpp
index cefcfb58..594d0eaa 100644
--- a/src/lib/core/server.cpp
+++ b/src/lib/core/server.cpp
@@ -77,8 +77,12 @@ void Server::start() {
                 if (!result.empty()) LOG_DEBUG("child process reaped");
                 for (std::vector<ChildReaper::ReapedProcess>::const_iterator it = result.begin(); it != result.end();
                      ++it) {
-                    if (it->status == 0) continue;
                     const Option<CgiProcessRepository::Data> data = state_.getCgiProcessRepository().get(it->pid);
+                    state_.getCgiProcessRepository().remove(it->pid);
+
+                    if (it->status == 0) continue;
+
+                    // CGI スクリプトがエラーで終わった場合
                     if (data.isNone()) {
                         LOG_WARNF(
                             "reaped child process %d with non-zero status %d, but no client fd found",