整理ws库代码

Zframework/websocket.lua

@@ -1,8 +1,8 @@
 --[[
-websocket client pure lua implement for love2d
+	websocket client pure lua implement for love2d
-by flaribbit
+	by flaribbit
 
-usage:
+	usage:
 		local client = require("websocket").new()
 		client:connect("127.0.0.1", 5000)
 		client:settimeout(0)
@@ -11,25 +11,19 @@ usage:
 		client:close()
 ]]
 
+-- local debug_print=print
 local socket = require"socket"
 local bit = require"bit"
-local band = bit.band
+local band, bor, bxor = bit.band, bit.bor, bit.bxor
-local bor = bit.bor
+local shl, shr = bit.lshift, bit.rshift
-local bxor = bit.bxor
-local shl = bit.lshift
-local shr = bit.rshift
-
--- local log_debug = print
-local log_debug = function()end
-local b2s = function(b)return b and"true"or"false"end
 
 local OPCODES = {
-    ["CONTINUE"]=0,
+	CONTINUE=0,
-    ["TEXT"]    =1,
+	TEXT    =1,
-    ["BINARY"]  =2,
+	BINARY  =2,
-    ["CLOSE"]   =8,
+	CLOSE   =8,
-    ["PING"]    =9,
+	PING    =9,
-    ["PONG"]    =10,
+	PONG    =10,
 }
 
 local _M = {
@@ -37,99 +31,93 @@ local _M = {
 }
 _M.__index = _M
 
-_M.new = function()
+function _M.new()
 	local m = {}
 	setmetatable(m, _M)
 	return m
 end
 
-_M.connect = function(self, host, port, path)
+local seckey = "osT3F7mvlojIvf3/8uIsJQ=="
-    local socket = socket.tcp()
+function _M.connect(self, host, port, path)
-    self.socket = socket
+	local SOCK = socket.tcp()
-    local res, err = socket:connect(host, port)
+	self.socket = SOCK
-    if res~=1 then
+	local res, err = SOCK:connect(host, port)
-        return res, err
+	if res~=1 then return res, err end
-    end
+	-- debug_print("[handshake] connected")
-    log_debug("[handshake] connected")
+
 	-- WebSocket handshake
-    local seckey = "osT3F7mvlojIvf3/8uIsJQ=="
+	res, err = SOCK:send("GET "..(path or"/").." HTTP/1.1\r\nHost: "..host..":"..port.."\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: "..seckey.."\r\n\r\n")
-    path = path or "/"
+	repeat res = SOCK:receive("*l") until res==""
-    res, err = socket:send("GET "..path.." HTTP/1.1\r\nHost: "..host..":"..port.."\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: "..seckey.."\r\n\r\n")
+	-- debug_print("[handshake] succeed")
-    repeat
-        res = socket:receive("*l")
-    until res==""
-    log_debug("[handshake] succeed")
 end
 
-_M.send = function(self, message)
+function _M.send(self, message)
-    local socket = self.socket
+	local SOCK = self.socket
 	local mask_key = {1, 14, 5, 14}
+
 	-- message type
-    socket:send(string.char(bor(0x80, OPCODES.BINARY)))
+	SOCK:send(string.char(bor(0x80, OPCODES.BINARY)))
+
 	-- length
 	local length = #message
-    log_debug("[encode] message length: "..length)
+	-- debug_print("[encode] message length: "..length)
 	if length>65535 then
-        socket:send(string.char(bor(127, 0x80), 0, 0, 0, 0,
+		SOCK:send(string.char(bor(127, 0x80), 0, 0, 0, 0,
 			band(shr(length, 24), 0xff),
 			band(shr(length, 16), 0xff),
 			band(shr(length, 8), 0xff),
 			band(length, 0xff)))
 	elseif length>125 then
-        socket:send(string.char(bor(126, 0x80),
+		SOCK:send(string.char(bor(126, 0x80),
 			band(shr(length, 8), 0xff),
 			band(length, 0xff)))
 	else
-        socket:send(string.char(bor(length, 0x80)))
+		SOCK:send(string.char(bor(length, 0x80)))
 	end
-    log_debug("[encode] masking")
+	-- debug_print("[encode] masking")
-    socket:send(string.char(unpack(mask_key)))
+	SOCK:send(string.char(unpack(mask_key)))
 	local msgbyte = {message:byte(1, length)}
 	for i = 1, length do
 		msgbyte[i] = bxor(msgbyte[i], mask_key[(i-1)%4+1])
 	end
-    socket:send(string.char(unpack(msgbyte)))
+	SOCK:send(string.char(unpack(msgbyte)))
-    log_debug("[encode] end")
+	-- debug_print("[encode] end")
 end
 
-_M.read = function(self)
+function _M.read(self)
 	-- byte 0-1
-    local socket = self.socket
+	local SOCK = self.socket
-    local res, err = socket:receive(2)
+	local res, err = SOCK:receive(2)
-    if res==nil then
+	if res==nil then return res, err end
-        return res, err
+
-    end
+	-- local flag_FIN = res:byte()>=0x80
-    local byte = res:byte()
+	-- local OPCODE = band(res:byte(), 0x0f)
-    local flag_FIN = byte>=0x80
+	-- local flag_MASK = res:byte(2)>=0x80
-    local OPCODE = band(byte, 0x0f)
+	-- debug_print("[decode] FIN="..tostring(flag_FIN)..", OPCODE="..OPCODE..", MASK="..tostring(flag_MASK))
-    byte = res:byte(2)
+
-    local flag_MASK = byte>=0x80
-    log_debug("[decode] FIN="..b2s(flag_FIN)..", OPCODE="..OPCODE..", MASK="..b2s(flag_MASK))
 	-- length
+	local byte = res:byte(2)
 	local length = band(byte, 0x7f)
 	if length==126 then
-        res = socket:receive(2)
+		res = SOCK:receive(2)
 		local b1, b2 = res:byte(1, 2)
 		length = shl(b1, 8) + b2
 	elseif length==127 then
-        res = socket:receive(8)
+		res = SOCK:receive(8)
 		local b = {res:byte(1, 8)}
 		length = shl(b[5], 32) + shl(b[6], 24) + shl(b[7], 8) + b[8]
 	end
-    log_debug("[decode] message length: "..length)
+	-- debug_print("[decode] message length: "..length)
+
 	-- data
-    res = socket:receive(length)
+	res = SOCK:receive(length)
-    log_debug("[decode] string length: "..#res)
+	-- debug_print("[decode] string length: "..#res)
-    log_debug("[decode] end")
+	-- debug_print("[decode] end")
 	return res
 end
 
-_M.close = function(self)
+function _M.close(self) self.socket:close() end
-    self.socket:close()
-end
 
-_M.settimeout = function(self, t)
+function _M.settimeout(self, t) self.socket:settimeout(t) end
-    self.socket:settimeout(t)
-end
 
 return _M