From 306b627ef820cdb57b879e7d3c29593819a4d6e1 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Tue, 30 Mar 2021 01:06:53 +0800
Subject: [PATCH] =?UTF-8?q?ws=E5=85=B3=E9=97=AD=E6=B6=88=E6=81=AF=E7=9A=84?=
 =?UTF-8?q?=E8=A7=A3=E6=9E=90=E4=BB=A3=E7=A0=81=E5=8D=87=E7=BA=A7=E5=B9=B6?=
 =?UTF-8?q?=E5=BD=92=E5=85=A5NET?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/gametoolfunc.lua | 25 +++++--------------------
 parts/net.lua          | 10 ++++++++++
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/parts/gametoolfunc.lua b/parts/gametoolfunc.lua
index eeb15fab..d1034d4d 100644
--- a/parts/gametoolfunc.lua
+++ b/parts/gametoolfunc.lua
@@ -1101,10 +1101,7 @@ do
 						NET.pong("app",message)
 					elseif op=="pong"then
 					elseif op=="close"then
-						message=JSON.decode(message)
-						if message then
-							LOG.print(text.wsClose..message.message,"warn")
-						end
+						NET.wsCloseMessage(message)
 						return
 					else
 						local res=JSON.decode(message)
@@ -1140,10 +1137,7 @@ do
 						NET.pong("user",message)
 					elseif op=="pong"then
 					elseif op=="close"then
-						message=JSON.decode(message)
-						if message then
-							LOG.print(text.wsClose..message.message,"warn")
-						end
+						NET.wsCloseMessage(message)
 						return
 					else
 						local res=JSON.decode(message)
@@ -1195,10 +1189,7 @@ do
 						NET.pong("play",message)
 					elseif op=="pong"then
 					elseif op=="close"then
-						message=JSON.decode(message)
-						if message then
-							LOG.print(text.wsClose..message.message,"warn")
-						end
+						NET.wsCloseMessage(message)
 						return
 					else
 						local res=JSON.decode(message)
@@ -1233,10 +1224,7 @@ do
 						NET.pong("stream",message)
 					elseif op=="pong"then
 					elseif op=="close"then
-						message=JSON.decode(message)
-						if message then
-							LOG.print(text.wsClose..message.message,"warn")
-						end
+						NET.wsCloseMessage(message)
 						return
 					else
 						--TODO
@@ -1256,10 +1244,7 @@ do
 						NET.pong("chat",message)
 					elseif op=="pong"then
 					elseif op=="close"then
-						message=JSON.decode(message)
-						if message then
-							LOG.print(text.wsClose..message.message,"warn")
-						end
+						NET.wsCloseMessage(message)
 						return
 					else
 						local res=JSON.decode(message)
diff --git a/parts/net.lua b/parts/net.lua
index 3883b3c3..00d520c1 100644
--- a/parts/net.lua
+++ b/parts/net.lua
@@ -19,6 +19,16 @@ function NET.unlock(name)
 	locks[name]=false
 end
 
+--wsEvent
+function NET.wsCloseMessage(message)
+	if message:sub(1,1)=="{"then
+		local mes=JSON.decode(message)
+		LOG.print(text.wsClose..mes.message,"warn")
+	else
+		LOG.print(text.wsClose..message,"warn")
+	end
+end
+
 --Account
 function NET.pong(wsName,message)
 	WS.send(wsName,message,"pong")