Merge f4c7c32 into f86b170

README.md

@@ -116,7 +116,7 @@ The client and server modules depend on:
 
   - luasocket
   - luabitop (if not using Lua 5.2 nor luajit)
-  - luasec
+  - luasec (optionally, if not using SSL/TLS)
   - copas (optionally)
   - lua-ev (optionally)
 

src/websocket/client_ev.lua

@@ -1,11 +1,11 @@
-
 local socket = require'socket'
 local tools = require'websocket.tools'
 local frame = require'websocket.frame'
 local handshake = require'websocket.handshake'
 local debug = require'debug'
 local tconcat = table.concat
 local tinsert = table.insert
+local ssl = require'ssl'
 
 local ev = function(ws)
   ws = ws or {}
@@ -44,7 +44,7 @@ local ev = function(ws)
       message_io = nil
     end
     if sock then
-      sock:shutdown()
+      --sock:shutdown() Doesn't work with secure connections
       sock:close()
       sock = nil
     end
@@ -74,7 +74,9 @@ local ev = function(ws)
     end
   end
   local handle_socket_err = function(err,io,sock)
-    if self.state == 'OPEN' then
+    if err == "wantread" or err == "wantwrite" then
+      -- Leave it alone because Secure Connection is trying to establish
+    elseif self.state == 'OPEN' then
       on_close(false,1006,err)
     elseif self.state ~= 'CLOSED' then
       on_error(err)
@@ -106,13 +108,28 @@ local ev = function(ws)
     async_send(encoded, nil, handle_socket_err)
   end
 
-  self.connect = function(_,url,ws_protocol)
+  self.connect = function(_,url,ws_protocol,secure_params)
     if self.state ~= 'CLOSED' then
       on_error('wrong state',true)
       return
     end
+    -- Preconnect for SSL if needed
+    assert(not sock)
+    sock = socket.tcp()
+    fd = sock:getfd()
+    assert(fd > -1)
+    -- set non blocking
+    sock:settimeout(0)
+    sock:setoption('tcp-nodelay',true)
     local protocol,host,port,uri = tools.parse_url(url)
-    if protocol ~= 'ws' then
+    local connected,err = sock:connect(host,port)
+    if protocol == 'wss' then
+      sock = ssl.wrap(sock, secure_params)
+      sock:dohandshake()
+
+      -- We have to re-initialize values that were set previously because it's a new socket
+      sock:settimeout(0)
+    elseif protocol ~= "ws" then
       on_error('bad protocol')
       return
     end
@@ -123,13 +140,6 @@ local ev = function(ws)
         ws_protocols_tbl = ws_protocol
     end
     self.state = 'CONNECTING'
-    assert(not sock)
-    sock = socket.tcp()
-    fd = sock:getfd()
-    assert(fd > -1)
-    -- set non blocking
-    sock:settimeout(0)
-    sock:setoption('tcp-nodelay',true)
     async_send,send_io_stop = require'websocket.ev_common'.async_send(sock,loop)
     handshake_io = ev.IO.new(
       function(loop,connect_io)
@@ -190,7 +200,6 @@ local ev = function(ws)
           end,
         handle_socket_err)
       end,fd,ev.WRITE)
-    local connected,err = sock:connect(host,port)
     if connected then
       handshake_io:callback()(loop,handshake_io)
     elseif err == 'timeout' or err == 'Operation already in progress' then

src/websocket/client_sync.lua

@@ -27,7 +27,7 @@ local new = function(ws)
   end
 
   self.sock_close = function(self)
-    --self.sock:shutdown() Causes errors?
+    --self.sock:shutdown() Doesn't work with secure connections
     self.sock:close()
   end
 

src/websocket/ev_common.lua

@@ -113,6 +113,10 @@ local message_io = function(sock,loop,on_message,on_error)
       if err then
         if err == 'timeout' and #part == 0 then
           return
+        elseif err == 'wantread' and #part == 0 then
+          return
+        elseif err == 'wantwrite' and #part == 0 then
+          return
         elseif #part == 0 then
           if message_io then
             message_io:stop(loop)
@@ -128,6 +132,7 @@ local message_io = function(sock,loop,on_message,on_error)
         encoded = encoded or part
       end
 
+
       repeat
         local decoded,fin,opcode,rest = frame.decode(encoded)
         if decoded then

src/websocket/sync.lua

@@ -117,7 +117,7 @@ local close = function(self,code,reason)
   return was_clean,code,reason or ''
 end
 
-local connect = function(self,ws_url,ws_protocol,ssl_params)
+local connect = function(self,ws_url,ws_protocol,secure_params)
   if self.state ~= 'CLOSED' then
     return nil,'wrong state'
   end
@@ -128,7 +128,7 @@ local connect = function(self,ws_url,ws_protocol,ssl_params)
     return nil,err
   end
   if protocol == 'wss' then
-    self.sock = ssl.wrap(self.sock, ssl_params)
+    self.sock = ssl.wrap(self.sock, secure_params)
     self.sock:dohandshake()
   elseif protocol ~= "ws" then
     return nil, 'bad protocol'