Merge pull request lipp#79 from lipp/remove-struct-dep-2

replace struct pack/unpack with bitops

Author: lipp

.travis.yml

@@ -1,4 +1,4 @@
-language: python
+language: node_js
 
 env:
   global:
@@ -27,7 +27,6 @@ before_install:
   - cd $TRAVIS_BUILD_DIR
 
 install:
-  - sudo pip install autobahntestsuite
   - sudo apt-get install libev-dev
   - git clone http://github.com/brimworks/lua-ev
   - cd lua-ev && sudo luarocks make rockspec/lua-ev-scm-1.rockspec && cd ..

Dockerfile

@@ -0,0 +1,36 @@
+FROM ubuntu:14.04
+# install autobahn tests suite (python)
+RUN apt-get update -y && apt-get install build-essential libssl-dev python -y
+# install lua
+ENV LUAROCKS_VERSION=2.0.13
+ENV LUAROCKS_BASE=luarocks-$LUAROCKS_VERSION
+ENV LUA luajit
+ENV LUA_DEV libluajit-5.1-dev 
+ENV LUA_VER 5.1
+ENV LUA_SFX jit
+ENV LUA_INCDIR /usr/include/luajit-2.0
+
+#    - LUA=lua5.1 LUA_DEV=liblua5.1-dev LUA_VER=5.1 LUA_SFX=5.1 LUA_INCDIR=/usr/include/lua5.1
+#   - LUA=lua5.2 LUA_DEV=liblua5.2-dev LUA_VER=5.2 LUA_SFX=5.2 LUA_INCDIR=/usr/include/lua5.2
+#   - LUA=luajit LUA_DEV=libluajit-5.1-dev LUA_VER=5.1 LUA_SFX=jit LUA_INCDIR=/usr/include/luajit-2.0
+RUN apt-get install ${LUA} ${LUA_DEV} wget libev-dev git-core unzip -y
+RUN lua${LUA_SFX} -v
+WORKDIR /
+RUN wget --quiet https://github.com/keplerproject/luarocks/archive/v$LUAROCKS_VERSION.tar.gz -O $LUAROCKS_BASE.tar.gz
+RUN wget --quiet https://nodejs.org/dist/latest/node-v4.0.0-linux-x64.tar.gz
+RUN tar xf node-v4.0.0-linux-x64.tar.gz
+ENV PATH /node-v4.0.0-linux-x64/bin:$PATH
+RUN node --version
+RUN npm install -g ws
+RUN tar zxpf $LUAROCKS_BASE.tar.gz
+RUN cd $LUAROCKS_BASE && ./configure --lua-version=$LUA_VER --lua-suffix=$LUA_SFX --with-lua-include="$LUA_INCDIR" && make install && cd ..
+RUN luarocks --version
+RUN git clone http://github.com/brimworks/lua-ev && cd lua-ev && luarocks make LIBEV_LIBDIR=/usr/lib/x86_64-linux-gnu/ rockspec/lua-ev-scm-1.rockspec && cd ..
+RUN luarocks install LuaCov
+RUN luarocks install lua_cliargs 2.3-3
+RUN luarocks install busted 1.10.0-1
+ADD . /lua-websockets
+WORKDIR /lua-websockets
+RUN luarocks make rockspecs/lua-websockets-scm-1.rockspec 
+RUN ./test.sh
+

README.md

@@ -115,9 +115,7 @@ var echoWs = new WebSocket('ws://127.0.0.1:8002','echo');
 The client and server modules depend on:
 
   - luasocket
-  - struct
   - luabitop (if not using Lua 5.2 nor luajit)
-  - luacrypto (optionally)
   - copas (optionally)
   - lua-ev (optionally)
 

echows.js

@@ -0,0 +1,8 @@
+var WebSocketServer = require('ws').Server;
+var wss = new WebSocketServer({ port: parseInt(process.argv[2]) });
+
+wss.on('connection', function connection(ws) {
+  ws.on('message', function incoming(message, flags) {
+  	ws.send(message, flags);
+  });
+});

lua-websockets.rockspec

@@ -10,12 +10,11 @@ description = {
   summary = "Websockets for Lua",
   homepage = "http://github.com/lipp/lua-websockets",
   license = "MIT/X11",
-  detailed = "Provides sync and async clients and servers for copas."
+  detailed = "Provides sync and async clients and servers for copas and lua-ev."
 }
 
 dependencies = {
   "lua >= 5.1",
-  "struct",
   "luasocket",
   "luabitop",
   "copas"

rockspecs/lua-websockets-scm-1.rockspec

@@ -14,7 +14,6 @@ description = {
 
 dependencies = {
   "lua >= 5.1",
-  "struct",
   "luasocket",
   "luabitop",
   "lua-ev",

spec/frame_spec.lua

@@ -1,6 +1,7 @@
 package.path = package.path..'../src'
 
 local frame = require'websocket.frame'
+local tools = require'websocket.tools'
 
 local bytes = string.char
 
@@ -18,7 +19,7 @@ describe(
       function()
         assert.is_same(type(frame),'table')
       end)
-    
+
     it(
       'provides a decode and a encode function',
       function()
@@ -27,7 +28,7 @@ describe(
         assert.is.same(type(frame.encode_close),'function')
         assert.is.same(type(frame.decode_close),'function')
       end)
-    
+
     it(
       'provides correct OPCODES',
       function()
@@ -38,8 +39,29 @@ describe(
         assert.is.same(frame.PING,9)
         assert.is.same(frame.PONG,10)
       end)
-    
-    
+
+    it('.encode_header_small is correct',
+      function()
+        local enc = frame.encode_header_small(123,33)
+        local enc_ref = tools.write_int8(123)..tools.write_int8(33)
+        assert.is_same(enc, enc_ref)
+      end)
+
+    it('.encode_header_medium is correct',
+      function()
+        local enc = frame.encode_header_medium(123,33,555)
+        local enc_ref = tools.write_int8(123)..tools.write_int8(33)..tools.write_int16(555)
+        assert.is_same(enc, enc_ref)
+      end)
+
+    it('.encode_header_big is correct',
+      function()
+        local enc = frame.encode_header_big(123,33,555,12987)
+        local enc_ref = tools.write_int8(123)..tools.write_int8(33)..tools.write_int32(555)..tools.write_int32(12987)
+        assert.is_same(enc, enc_ref)
+      end)
+
+
     it(
       'RFC: decode a single-frame unmasked text message',
       function()
@@ -50,7 +72,7 @@ describe(
         assert.is_same(rest,'foo')
         assert.is_false(masked)
       end)
-    
+
     it(
       'RFC: decode a single-frame unmasked text message bytewise and check min length',
       function()
@@ -70,7 +92,7 @@ describe(
           end
         end
       end)
-    
+
     it(
       'RFC: decode a single-frame masked text message',
       function()
@@ -81,7 +103,7 @@ describe(
         assert.is_same(rest,'foo')
         assert.is_truthy(masked)
       end)
-    
+
     it(
       'RFC: decode a fragmented test message',
       function()
@@ -91,15 +113,15 @@ describe(
         assert.is.same(decoded,'Hel')
         assert.is_same(rest,'')
         assert.is_falsy(masked)
-        
+
         decoded,fin,opcode,rest,masked = frame.decode(lo)
         assert.is_true(fin)
         assert.is_same(opcode,0x0)
         assert.is.same(decoded,'lo')
         assert.is_same(rest,'')
         assert.is_falsy(masked)
       end)
-    
+
     it(
       'refuse incomplete unmasked frame',
       function()
@@ -108,7 +130,7 @@ describe(
         assert.is_same(fin,#hello_unmasked-4)
         assert.is_falsy(opcode)
       end)
-    
+
     it(
       'refuse incomplete masked frame',
       function()
@@ -117,7 +139,7 @@ describe(
         assert.is_same(fin,#hello_masked-4)
         assert.is_falsy(opcode)
       end)
-    
+
     it(
       'encode single-frame unmasked text',
       function()
@@ -135,15 +157,15 @@ describe(
         assert.is_same(opcode,frame.TEXT)
         assert.is_falsy(masked)
       end)
-    
+
     local random_text = function(len)
       local chars = {}
       for i=1,len do
         chars[i] = string.char(math.random(33,126))
       end
       return table.concat(chars)
     end
-    
+
     it(
       'encode and decode single-frame of length 127 unmasked text',
       function()
@@ -159,7 +181,7 @@ describe(
         assert.is_same(rest,'')
         assert.is_falsy(masked)
       end)
-    
+
     it(
       'encode and decode single-frame of length 0xffff-1 unmasked text',
       function()
@@ -175,7 +197,7 @@ describe(
         assert.is_same(rest,'')
         assert.is_falsy(masked)
       end)
-    
+
     it(
       'encode and decode single-frame of length 0xffff+1 unmasked text',
       function()
@@ -189,7 +211,7 @@ describe(
         assert.is_true(fin)
         assert.is_same(opcode,frame.TEXT)
       end)
-    
+
     it(
       'encode single-frame masked text',
       function()
@@ -201,7 +223,7 @@ describe(
         assert.is_same(rest,'')
         assert.is_truthy(masked)
       end)
-    
+
     it(
       'encode fragmented unmasked text',
       function()
@@ -210,14 +232,14 @@ describe(
         assert.is_falsy(fin)
         assert.is_same(opcode,0x1)
         assert.is.same(decoded,'Hel')
-        
+
         local lo = frame.encode('lo',frame.CONTINUATION,false)
         decoded,fin,opcode = frame.decode(lo)
         assert.is_true(fin)
         assert.is_same(opcode,0x0)
         assert.is.same(decoded,'lo')
       end)
-    
+
     it(
       'encodes and decodes close packet correctly',
       function()
@@ -229,5 +251,5 @@ describe(
         assert.is_same(dcode,code)
         assert.is_same(dreason,reason)
       end)
-    
+
   end)

spec/server_copas_spec.lua

@@ -256,6 +256,7 @@ describe(
         it(
           'broadcast works',
           function(done)
+            settimeout(6)
             local n = 20
             local n_clients = 0
             local closed = 0

spec/server_ev_spec.lua

@@ -232,7 +232,7 @@ describe(
         it(
           'echo works with 0xffff-1 byte messages',
           function(done)
-            settimeout(3.0)
+            settimeout(10.0)
             local message = random_text(0xffff-1)
             local wsc = client.ev()
             on_new_echo_client = async(
@@ -264,7 +264,7 @@ describe(
         it(
           'echo works with 0xffff+1 byte messages',
           function(done)
-            settimeout(3.0)
+            settimeout(6.0)
             local message = random_text(0xffff+1)
             local wsc = client.ev()
             on_new_echo_client = async(