fix: return 404 instead of 500 for non-existent routes

- Set default response format to JSON for API
- Remove forced HTML format in RequestDispatcher
- Handle HttpException with correct status codes

Author: dacheng-gao

examples/app-api/config/web.php

@@ -14,6 +14,9 @@
                 'application/json' => 'yii\web\JsonParser',
             ],
         ],
+        'response' => [
+            'format' => \yii\web\Response::FORMAT_JSON,
+        ],
         'session' => [
             'class' => \Dacheng\Yii2\Swoole\Session\CoroutineSession::class,
             'redis' => 'redis',
@@ -25,9 +28,6 @@
             'identityClass' => \app\models\UserIdentity::class,
             'enableAutoLogin' => false,
         ],
-        'errorHandler' => [
-            'errorAction' => 'site/error',
-        ],
         'log' => [
             'traceLevel' => YII_DEBUG ? 3 : 0,
             'flushInterval' => 1,

src/Server/RequestDispatcher.php

@@ -74,7 +74,6 @@ public function dispatch(Request $request, Response $response, SwooleCoroutineHt
 
         $yiiResponse = $app->getResponse();
         $yiiResponse->clear();
-        $yiiResponse->format = YiiResponse::FORMAT_HTML;
         $this->prepareLogger($app);
 
         try {
@@ -139,7 +138,6 @@ public function dispatch(Request $request, Response $response, SwooleCoroutineHt
                 $yiiResponse->_cookies = null;
             }
             $yiiResponse->clear();
-            $yiiResponse->format = YiiResponse::FORMAT_HTML;
 
             // Clear request data
             if ($yiiRequest instanceof YiiRequest) {
@@ -191,28 +189,38 @@ private function handleExceptionWithYii(Throwable $exception, Application $app,
             $errorHandler->exception = $exception;
             $errorHandler->logException($exception);
 
-            $bufferLevel = ob_get_level();
-            ob_start();
-            try {
-                $this->invokeErrorHandlerRenderException($errorHandler, $exception);
-                $bufferedOutput = ob_get_contents() ?: '';
-            } finally {
-                while (ob_get_level() > $bufferLevel) {
-                    ob_end_clean();
-                }
-
-                $errorHandler->exception = null;
-            }
-
             $yiiResponse = $app->getResponse();
             if ($yiiResponse->isSent) {
                 $yiiResponse->isSent = false;
             }
 
-            if ($yiiResponse->content === null) {
-                $yiiResponse->content = $bufferedOutput;
+            if ($exception instanceof \yii\web\HttpException) {
+                $yiiResponse->setStatusCode($exception->statusCode);
+            } else {
+                $yiiResponse->setStatusCode(500);
+            }
+
+            if ($yiiResponse->format === YiiResponse::FORMAT_JSON) {
+                $yiiResponse->data = $this->convertExceptionToArray($exception, $errorHandler);
+            } else {
+                $bufferLevel = ob_get_level();
+                ob_start();
+                try {
+                    $this->invokeErrorHandlerRenderException($errorHandler, $exception);
+                    $bufferedOutput = ob_get_contents() ?: '';
+                } finally {
+                    while (ob_get_level() > $bufferLevel) {
+                        ob_end_clean();
+                    }
+                }
+
+                if ($yiiResponse->content === null) {
+                    $yiiResponse->content = $bufferedOutput;
+                }
             }
 
+            $errorHandler->exception = null;
+
             if ($this->isWritable($swooleResponse)) {
                 $this->finalizeResponse($swooleResponse, $yiiResponse);
             }
@@ -225,6 +233,40 @@ private function handleExceptionWithYii(Throwable $exception, Application $app,
         }
     }
 
+    private function convertExceptionToArray(Throwable $exception, ErrorHandler $errorHandler): array
+    {
+        if (!defined('YII_DEBUG') || !YII_DEBUG) {
+            if (!($exception instanceof \yii\base\UserException) && !($exception instanceof \yii\web\HttpException)) {
+                $exception = new \yii\web\HttpException(500, Yii::t('yii', 'An internal server error occurred.'));
+            }
+        }
+
+        $array = [
+            'name' => ($exception instanceof \yii\base\Exception || $exception instanceof \yii\base\ErrorException) 
+                ? $exception->getName() 
+                : 'Exception',
+            'message' => $exception->getMessage(),
+            'code' => $exception->getCode(),
+        ];
+
+        if ($exception instanceof \yii\web\HttpException) {
+            $array['status'] = $exception->statusCode;
+        }
+
+        if (defined('YII_DEBUG') && YII_DEBUG) {
+            $array['type'] = get_class($exception);
+            $array['file'] = $exception->getFile();
+            $array['line'] = $exception->getLine();
+            $array['stack-trace'] = explode("\n", $exception->getTraceAsString());
+        }
+
+        if (($prev = $exception->getPrevious()) !== null) {
+            $array['previous'] = $this->convertExceptionToArray($prev, $errorHandler);
+        }
+
+        return $array;
+    }
+
     private function invokeErrorHandlerRenderException(ErrorHandler $errorHandler, Throwable $exception): void
     {
         if (self::$renderExceptionMethod === null) {