[11.x] Improvements for the ServeCommand (add more loves & elevate DX) (

#51957) * use InteractWithTimes * Improvements for ServeCommand
laravel · Jul 1, 2024 · 4371762 · 4371762
1 parent 264afa5
commit 4371762
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 9 deletions.
diff --git a/src/Illuminate/Foundation/Console/ServeCommand.php b/src/Illuminate/Foundation/Console/ServeCommand.php
@@ -5,6 +5,7 @@
 use Illuminate\Console\Command;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Env;
+use Illuminate\Support\InteractsWithTime;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Process\PhpExecutableFinder;
@@ -15,6 +16,8 @@
 #[AsCommand(name: 'serve')]
 class ServeCommand extends Command
 {
+    use InteractsWithTime;
+
     /**
      * The console command name.
      *
@@ -88,14 +91,14 @@ class ServeCommand extends Command
     public function handle()
     {
         $environmentFile = $this->option('env')
-                            ? base_path('.env').'.'.$this->option('env')
-                            : base_path('.env');
+            ? base_path('.env').'.'.$this->option('env')
+            : base_path('.env');
 
         $hasEnvironment = file_exists($environmentFile);
 
         $environmentLastModified = $hasEnvironment
-                            ? filemtime($environmentFile)
-                            : now()->addDays(30)->getTimestamp();
+            ? filemtime($environmentFile)
+            : now()->addDays(30)->getTimestamp();
 
         $process = $this->startProcess($hasEnvironment);
 
@@ -242,7 +245,7 @@ protected function getHostAndPort()
     protected function canTryAnotherPort()
     {
         return is_null($this->input->getOption('port')) &&
-               ($this->input->getOption('tries') > $this->portOffset);
+            ($this->input->getOption('tries') > $this->portOffset);
     }
 
     /**
@@ -292,23 +295,29 @@ protected function flushOutputBuffer()
 
                     $this->requestsPool[$requestPort] = [
                         $this->getDateFromLine($line),
-                        false,
+                        $this->requestsPool[$requestPort][1] ?? false,
+                        microtime(true),
                     ];
                 } elseif (str($line)->contains([' [200]: GET '])) {
                     $requestPort = $this->getRequestPortFromLine($line);
 
                     $this->requestsPool[$requestPort][1] = trim(explode('[200]: GET', $line)[1]);
+                } elseif (str($line)->contains('URI:')) {
+                    $requestPort = $this->getRequestPortFromLine($line);
+
+                    $this->requestsPool[$requestPort][1] = trim(explode('URI: ', $line)[1]);
                 } elseif (str($line)->contains(' Closing')) {
                     $requestPort = $this->getRequestPortFromLine($line);
 
                     if (empty($this->requestsPool[$requestPort])) {
                         $this->requestsPool[$requestPort] = [
                             $this->getDateFromLine($line),
                             false,
+                            microtime(true),
                         ];
                     }
 
-                    [$startDate, $file] = $this->requestsPool[$requestPort];
+                    [$startDate, $file, $startMicrotime] = $this->requestsPool[$requestPort];
 
                     $formattedStartedAt = $startDate->format('Y-m-d H:i:s');
 
@@ -318,7 +327,7 @@ protected function flushOutputBuffer()
 
                     $this->output->write("  <fg=gray>$date</> $time");
 
-                    $runTime = $this->getDateFromLine($line)->diffInSeconds($startDate);
+                    $runTime = $this->runTimeForHumans($startMicrotime);
 
                     if ($file) {
                         $this->output->write($file = " $file");
@@ -327,7 +336,7 @@ protected function flushOutputBuffer()
                     $dots = max(terminal()->width() - mb_strlen($formattedStartedAt) - mb_strlen($file) - mb_strlen($runTime) - 9, 0);
 
                     $this->output->write(' '.str_repeat('<fg=gray>.</>', $dots));
-                    $this->output->writeln(" <fg=gray>~ {$runTime}s</>");
+                    $this->output->writeln(" <fg=gray>~ {$runTime}</>");
                 } elseif (str($line)->contains(['Closed without sending a request', 'Failed to poll event'])) {
                     // ...
                 } elseif (! empty($line)) {

diff --git a/src/Illuminate/Foundation/resources/server.php b/src/Illuminate/Foundation/resources/server.php
@@ -13,4 +13,11 @@
     return false;
 }
 
+$formattedDateTime = date('D M j H:i:s Y');
+
+$requestMethod = $_SERVER['REQUEST_METHOD'];
+$remoteAddress = $_SERVER['REMOTE_ADDR'] . ':' . $_SERVER['REMOTE_PORT'];
+
+file_put_contents("php://stdout", "[$formattedDateTime] $remoteAddress [$requestMethod] URI: $uri\n");
+
 require_once $publicPath.'/index.php';