From 842220e4dedee479bae5309ee454d690fa6ef478 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=91=E6=9E=97?= <as2252258@163.com>
Date: Fri, 7 Jan 2022 17:57:27 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E6=94=B9=E5=90=8D"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit fdf58326
---
 kiri-websocket-server/Server.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/kiri-websocket-server/Server.php b/kiri-websocket-server/Server.php
index 9ecdc227..b5c27a58 100644
--- a/kiri-websocket-server/Server.php
+++ b/kiri-websocket-server/Server.php
@@ -9,7 +9,6 @@ use Kiri\Abstracts\AbstractServer;
 use Note\Inject;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
-use Server\Constant;
 use Server\Contract\OnCloseInterface;
 use Server\Contract\OnHandshakeInterface;
 use Server\Contract\OnMessageInterface;
@@ -17,7 +16,6 @@ use Server\Contract\OnOpenInterface;
 use Server\SwooleServerInterface;
 use Swoole\Http\Request;
 use Swoole\Http\Response;
-use Swoole\WebSocket\CloseFrame;
 use Swoole\WebSocket\Frame;
 use Swoole\WebSocket\Server as WebSocketServer;
 
@@ -114,13 +112,12 @@ class Server extends AbstractServer implements OnHandshakeInterface, OnMessageIn
 			} else {
 				$this->protocol($request, $response);
 			}
-		} catch (\Throwable $throwable) {
-			$response->status(500, $throwable->getMessage());
-			$response->end();
-		} finally {
 			if ($this->callback instanceof OnOpenInterface) {
 				$this->callback->onOpen($this->server, $request);
 			}
+		} catch (\Throwable $throwable) {
+			$response->status(4000 + $throwable->getCode(), $throwable->getMessage());
+			$response->end();
 		}
 	}