enqueue 'send' messages instead of 'join'. bump v0.1.4

colyseus · Mar 9, 2016 · 48c7bef · 48c7bef
1 parent eede00c
commit 48c7bef
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 24 deletions.
diff --git a/coronasdk-example/colyseus.lua b/coronasdk-example/colyseus.lua
@@ -53,9 +53,16 @@ function Colyseus:close()
 end
 
 function Colyseus:send(data)
-  self.ws:send( msgpack.pack(data), {
-    type = WebSocket.BINARY
-  } )
+  if self.ws.readyState == WebSocket.ESTABLISHED then -- same as WebSocket.OPEN in JavaScript
+    self.ws:send( msgpack.pack(data), {
+      type = WebSocket.BINARY
+    } )
+
+  else
+    -- WebSocket not connected.
+    -- Enqueue data to be sent when readyState == OPEN
+    table.insert(self._enqueuedCalls, {'send', data})
+  end
 end
 
 function Colyseus:join(...)
@@ -68,14 +75,7 @@ function Colyseus:join(...)
     self.rooms[ roomName ] = room.create(self, roomName)
   end
 
-  if self.ws.readyState == WebSocket.ESTABLISHED then -- same as WebSocket.OPEN in JavaScript
-    self:send({ protocol.JOIN_ROOM, roomName, options or {} })
-
-  else
-    -- WebSocket not connected.
-    -- Enqueue it to be called when readyState == OPEN
-    table.insert(self._enqueuedCalls, {'join', args})
-  end
+  self:send({ protocol.JOIN_ROOM, roomName, options or {} })
 
   return self.rooms[ roomName ]
 end

diff --git a/publish b/publish
@@ -1,7 +1,7 @@
 # version=$(git tag -l | tail -1)
 
-version="0.1.3"
-rev="2" # rev="1"
+version="0.1.4"
+rev="1" # rev="1"
 
 name="colyseus-$version-$rev"
 

diff --git a/src/colyseus.lua b/src/colyseus.lua
@@ -53,9 +53,16 @@ function Colyseus:close()
 end
 
 function Colyseus:send(data)
-  self.ws:send( msgpack.pack(data), {
-    type = WebSocket.BINARY
-  } )
+  if self.ws.readyState == WebSocket.ESTABLISHED then -- same as WebSocket.OPEN in JavaScript
+    self.ws:send( msgpack.pack(data), {
+      type = WebSocket.BINARY
+    } )
+
+  else
+    -- WebSocket not connected.
+    -- Enqueue data to be sent when readyState == OPEN
+    table.insert(self._enqueuedCalls, {'send', data})
+  end
 end
 
 function Colyseus:join(...)
@@ -68,14 +75,7 @@ function Colyseus:join(...)
     self.rooms[ roomName ] = room.create(self, roomName)
   end
 
-  if self.ws.readyState == WebSocket.ESTABLISHED then -- same as WebSocket.OPEN in JavaScript
-    self:send({ protocol.JOIN_ROOM, roomName, options or {} })
-
-  else
-    -- WebSocket not connected.
-    -- Enqueue it to be called when readyState == OPEN
-    table.insert(self._enqueuedCalls, {'join', args})
-  end
+  self:send({ protocol.JOIN_ROOM, roomName, options or {} })
 
   return self.rooms[ roomName ]
 end