wip

Author: michalsn

app/Config/WorkerMode.php

@@ -26,6 +26,7 @@ class WorkerMode
      * - `commands`: CLI commands registry
      * - `codeigniter`: Main application instance
      * - `superglobals`: Superglobals wrapper
+     * - `routes`: Router configuration
      *
      * @var list<string>
      */
@@ -38,36 +39,10 @@ class WorkerMode
         'commands',
         'codeigniter',
         'superglobals',
+        'routes',
+        'cache',
     ];
 
-    /**
-     * Database connection strategy
-     *
-     * Determines how database connections are handled between requests:
-     *
-     * - 'keep-alive' (recommended):
-     *   Keeps connections alive across requests for best performance
-     * - 'disconnect':
-     *   Closes all connections after each request
-     *
-     * @var 'disconnect'|'keep-alive'
-     */
-    public string $databaseStrategy = 'keep-alive';
-
-    /**
-     * Cache handler strategy
-     *
-     * Determines how cache handlers are managed between requests:
-     *
-     * - 'keep-alive' (recommended):
-     *   Keeps cache handler alive across requests for best performance
-     * - 'disconnect':
-     *   Closes the handler after each request
-     *
-     * @var 'disconnect'|'keep-alive'
-     */
-    public string $cacheStrategy = 'keep-alive';
-
     /**
      * Reset Factories
      *

system/Cache/Handlers/RedisHandler.php

@@ -229,7 +229,7 @@ public function ping(): bool
         try {
             $result = $this->redis->ping();
 
-            return in_array($result, [true, '+PONG', 'PONG'], true);
+            return in_array($result, [true, '+PONG'], true);
         } catch (RedisException) {
             return false;
         }

system/Commands/Worker/Views/Caddyfile.tpl

@@ -33,8 +33,6 @@
 
     # Route all PHP requests through the worker
     php_server {
-        # Use frankenphp-worker.php as the entry point
-        index frankenphp-worker.php
         # Route all requests through the worker
         try_files {path} frankenphp-worker.php
     }

system/Commands/Worker/Views/frankenphp-worker.php.tpl

@@ -69,8 +69,11 @@ $workerConfig = config('WorkerMode');
  */
 
 $handler = function () use ($app, $workerConfig) {
-    // Validate database connections
-    DatabaseConfig::validateForWorkerMode($workerConfig);
+    // Validate database connections before handling request
+    DatabaseConfig::validateForWorkerMode();
+
+    // Validate cache connection before handling request
+    Services::validateForWorkerMode();
 
     // Reset request-specific state
     $app->resetForWorkerMode();
@@ -105,8 +108,8 @@ while (frankenphp_handle_request($handler)) {
         Services::session()->close();
     }
 
-    // Reset database connections based on strategy (keep-alive or disconnect)
-    DatabaseConfig::resetForWorkerMode($workerConfig);
+    // Cleanup connections with uncommitted transactions
+    DatabaseConfig::cleanupForWorkerMode();
 
     // Reset model/entity instances (if enabled)
     if ($workerConfig->resetFactories) {
@@ -117,7 +120,7 @@ while (frankenphp_handle_request($handler)) {
     Services::resetForWorkerMode($workerConfig);
 
     // Reset performance
-    Events::resetForWorkerMode();
+    Events::cleanupForWorkerMode();
 
     // Reset persistent services that accumulate state
     if (Services::has('timer')) {

system/Commands/Worker/WorkerInstall.php

@@ -10,6 +10,7 @@
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
  */
+
 namespace CodeIgniter\Commands\Worker;
 
 use CodeIgniter\CLI\BaseCommand;

system/Commands/Worker/WorkerUninstall.php

@@ -10,6 +10,7 @@
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
  */
+
 namespace CodeIgniter\Commands\Worker;
 
 use CodeIgniter\CLI\BaseCommand;

system/Config/BaseService.php

@@ -381,9 +381,9 @@ public static function reset(bool $initAutoloader = true)
      * This should be called at the beginning of each request in worker mode,
      * before the application runs.
      */
-    public static function validateForWorkerMode(WorkerMode $config): void
+    public static function validateForWorkerMode(): void
     {
-        if ($config->cacheStrategy !== 'keep-alive' || ! isset(static::$instances['cache'])) {
+        if (! isset(static::$instances['cache'])) {
             return;
         }
 
@@ -412,15 +412,6 @@ public static function resetForWorkerMode(WorkerMode $config): void
         $persistentInstances = [];
 
         foreach (static::$instances as $serviceName => $service) {
-            if ($serviceName === 'cache') {
-                if ($config->cacheStrategy === 'keep-alive') {
-                    // Persist cache instance in keep-alive mode
-                    $persistentInstances[$serviceName] = $service;
-                }
-
-                continue;
-            }
-
             // Persist services in the persistent list
             if (in_array($serviceName, $config->persistentServices, true)) {
                 $persistentInstances[$serviceName] = $service;

system/Database/Config.php

@@ -161,9 +161,9 @@ protected static function ensureFactory()
      * This should be called at the beginning of each request in worker mode,
      * before the application runs.
      */
-    public static function validateForWorkerMode(WorkerMode $config): void
+    public static function validateForWorkerMode(): void
     {
-        if ($config->databaseStrategy !== 'keep-alive') {
+        if (static::$instances === []) {
             return;
         }
 
@@ -175,44 +175,24 @@ public static function validateForWorkerMode(WorkerMode $config): void
     }
 
     /**
-     * Reset database connections for worker mode.
+     * Cleanup database connections for worker mode.
      *
-     * This method handles connection state management between requests
-     * in long-running worker processes.
+     * If any uncommitted transactions are found, the connection
+     * is closed and reconnected to ensure a clean state for the next request.
+     *
+     * Uncommitted transactions at this point indicate a bug in the
+     * application code (transactions should be completed before request ends).
      *
      * Called at the END of each request to clean up state.
      */
-    public static function resetForWorkerMode(WorkerMode $config): void
+    public static function cleanupForWorkerMode(): void
     {
         foreach (static::$instances as $group => $connection) {
-            switch ($config->databaseStrategy) {
-                case 'disconnect':
-                    $connection->close();
-                    break;
-
-                case 'keep-alive':
-                    $maxAttempts = 10; // Prevent infinite loop
-                    $attempts    = 0;
-
-                    while ($connection->transDepth > 0 && $attempts < $maxAttempts) {
-                        if (! $connection->transRollback()) {
-                            log_message('error', "Database transaction rollback failed for group: {$group}");
-                            break;
-                        }
-                        $attempts++;
-                    }
-
-                    if ($connection->transDepth > 0) {
-                        log_message('warning', "Database connection has uncommitted transactions after cleanup: {$group}");
-                    }
-                    break;
+            if ($connection->transDepth > 0) {
+                log_message('error', "Uncommitted transaction detected in database group '{$group}'. Transactions must be completed before request ends. Reconnecting to ensure clean state.");
+                $connection->close();
+                $connection->initialize();
             }
         }
-
-        // If using the disconnect strategy, clear the instances array
-        if ($config->databaseStrategy === 'disconnect') {
-            static::$instances = [];
-            static::$factory   = null;
-        }
     }
 }

system/Events/Events.php

@@ -286,15 +286,11 @@ public static function getPerformanceLogs()
     }
 
     /**
-     * Reset events for worker mode.
+     * Cleanup performance log for worker mode.
      *
-     * Uses WorkerMode config to determine behavior.
-     * Clears performance logs and re-initializes event listeners from config files.
-     *
-     * Note: This clears dynamically registered listeners. If your application
-     * registers listeners at runtime, they will need to be re-registered for each request.
+     * Called at the END of each request to clean up state.
      */
-    public static function resetForWorkerMode(): void
+    public static function cleanupForWorkerMode(): void
     {
         static::$performanceLog = [];
     }

system/Session/Handlers/MemcachedHandler.php

@@ -15,6 +15,7 @@
 
 use CodeIgniter\I18n\Time;
 use CodeIgniter\Session\Exceptions\SessionException;
+use CodeIgniter\Session\PersistsConnection;
 use Config\Session as SessionConfig;
 use Memcached;
 use ReturnTypeWillChange;
@@ -24,6 +25,8 @@
  */
 class MemcachedHandler extends BaseHandler
 {
+    use PersistsConnection;
+
     /**
      * Memcached instance.
      *
@@ -83,6 +86,23 @@ public function __construct(SessionConfig $config, string $ipAddress)
      */
     public function open($path, $name): bool
     {
+        if ($this->hasPersistentConnection()) {
+            $memcached = $this->getPersistentConnection();
+            $version   = $memcached->getVersion();
+
+            if (is_array($version)) {
+                foreach ($version as $serverVersion) {
+                    if ($serverVersion !== false) {
+                        $this->memcached = $memcached;
+
+                        return true;
+                    }
+                }
+            }
+
+            $this->setPersistentConnection(null);
+        }
+
         $this->memcached = new Memcached();
         $this->memcached->setOption(Memcached::OPT_BINARY_PROTOCOL, true); // required for touch() usage
 
@@ -131,6 +151,8 @@ public function open($path, $name): bool
             return false;
         }
 
+        $this->setPersistentConnection($this->memcached);
+
         return true;
     }
 
@@ -210,12 +232,6 @@ public function close(): bool
                 $this->memcached->delete($this->lockKey);
             }
 
-            if (! $this->memcached->quit()) {
-                return false;
-            }
-
-            $this->memcached = null;
-
             return true;
         }