SweetSea/Techmino
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改ws模块的debug开关变量名

Browse Source
This commit is contained in:
MrZ626
2021-06-06 17:12:30 +08:00
parent 0a63bea195
commit f9ed93641c
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Zframework/websocket.lua
View File

@@ -1,11 +1,12 @@
-- local host="127.0.0.1" local host=
-- local host="192.168.114.102" -- "127.0.0.1"
local host="krakens.tpddns.cn" -- "192.168.114.102"
-- local host="game.techmino.org" "krakens.tpddns.cn"
-- "game.techmino.org"
local port="10026" local port="10026"
local path="/tech/socket/v1" local path="/tech/socket/v1"
local debug=""--S:send, R:receive, M=mark local debugMode=""--S:send, R:receive, M=mark
local wsThread=[[ local wsThread=[[
-- lua + LÖVE threading websocket client -- lua + LÖVE threading websocket client
@@ -87,7 +88,7 @@ local _send do
local mask_str=char(unpack(mask_key)) local mask_str=char(unpack(mask_key))
function _send(op,message) function _send(op,message)
]]..(debug:find'S'and""or"--")..[[print((">> %s[%d]:%s"):format(threadName,#message,message)) ]]..(debugMode:find'S'and""or"--")..[[print((">> %s[%d]:%s"):format(threadName,#message,message))
--Message type --Message type
SOCK:send(char(bor(0x80,op))) SOCK:send(char(bor(0x80,op)))
@@ -154,7 +155,7 @@ while true do--Running
if s then if s then
res=s res=s
elseif p then--UNF head elseif p then--UNF head
]]..(debug:find'R'and""or"--")..[[print(("<< %s[%d/%d]:%s"):format(threadName,#p,length,#p<50 and p or p:sub(1,50))) ]]..(debugMode:find'R'and""or"--")..[[print(("<< %s[%d/%d]:%s"):format(threadName,#p,length,#p<50 and p or p:sub(1,50)))
UFF=true UFF=true
sBuffer=sBuffer..p sBuffer=sBuffer..p
length=length-#p length=length-#p
@@ -166,11 +167,11 @@ while true do--Running
else else
local s,e,p=SOCK:receive(length) local s,e,p=SOCK:receive(length)
if s then if s then
]]..(debug:find'R'and""or"--")..[[print(("<< %s(%d):%s"):format(threadName,length,#s<50 and s or s:sub(1,50))) ]]..(debugMode:find'R'and""or"--")..[[print(("<< %s(%d):%s"):format(threadName,length,#s<50 and s or s:sub(1,50)))
sBuffer=sBuffer..s sBuffer=sBuffer..s
length=length-#s length=length-#s
elseif p then elseif p then
]]..(debug:find'R'and""or"--")..[[print(("<< %s(%d):%s"):format(threadName,length,#p<50 and p or p:sub(1,50))) ]]..(debugMode:find'R'and""or"--")..[[print(("<< %s(%d):%s"):format(threadName,length,#p<50 and p or p:sub(1,50)))
sBuffer=sBuffer..p sBuffer=sBuffer..p
length=length-#p length=length-#p
end end
@@ -181,7 +182,7 @@ while true do--Running
break break
end end
end end
]]..(debug:find'R'and""or"--")..[[print(("<< %s[(%d)]:%s"):format(threadName,#res,#res<800 and res or res:sub(1,150).."\n...\n"..res:sub(-150))) ]]..(debugMode:find'R'and""or"--")..[[print(("<< %s[(%d)]:%s"):format(threadName,#res,#res<800 and res or res:sub(1,150).."\n...\n"..res:sub(-150)))
--React --React
if op==8 then--8=close if op==8 then--8=close
@@ -195,21 +196,21 @@ while true do--Running
elseif op==0 then--0=continue elseif op==0 then--0=continue
lBuffer=lBuffer..res lBuffer=lBuffer..res
if fin then if fin then
]]..(debug:find'M'and""or"--")..[[print("FIN=1 (c") ]]..(debugMode:find'M'and""or"--")..[[print("FIN=1 (c")
readCHN:push(lBuffer) readCHN:push(lBuffer)
lBuffer="" lBuffer=""
else else
]]..(debug:find'M'and""or"--")..[[print("FIN=0 (c") ]]..(debugMode:find'M'and""or"--")..[[print("FIN=0 (c")
end end
else else
readCHN:push(op) readCHN:push(op)
if fin then if fin then
]]..(debug:find'M'and""or"--")..[[print("OP: "..op.."\tFIN=1") ]]..(debugMode:find'M'and""or"--")..[[print("OP: "..op.."\tFIN=1")
readCHN:push(res) readCHN:push(res)
else else
]]..(debug:find'M'and""or"--")..[[print("OP: "..op.."\tFIN=0") ]]..(debugMode:find'M'and""or"--")..[[print("OP: "..op.."\tFIN=0")
sBuffer=res sBuffer=res
]]..(debug:find'M'and""or"--")..[[print("START pack: "..res) ]]..(debugMode:find'M'and""or"--")..[[print("START pack: "..res)
end end
end end
end end