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")