add 'rejoin' method. add 'immediate' as option on 'listen' method.

Author: endel

colyseus/client.lua

@@ -71,7 +71,7 @@ function client:create_connection(path, options)
 
   local params = { "colyseusid=" .. storage.get_item("colyseusid") }
   for k, v in pairs(options) do
-    table.insert(params, k .. "=" .. v)
+    table.insert(params, k .. "=" .. tostring(v))
   end
 
   pprint(self.hostname .. path .. "?" .. table.concat(params, "&"))
@@ -99,12 +99,6 @@ function client:join(...)
   self.requestId = self.requestId + 1
   options.requestId = self.requestId;
 
-  -- get last session id for reconnection
-  local reconnectionSessionId = storage.get_item("reconnection")
-  if reconnectionSessionId ~= nil then
-    options.sessionId = reconnectionSessionId
-  end
-
   local room = Room.create(roomName, options)
 
   -- remove references on leaving
@@ -120,6 +114,17 @@ function client:join(...)
   return room
 end
 
+function client:rejoin(roomName, sessionId)
+  -- reopen client connection if it's closed
+  if self.connection.state == "CLOSED" then
+    self.connection:open()
+  end
+
+  return self:join(roomName, {
+    sessionId = sessionId
+  })
+end
+
 function client:on_batch_message(messages)
   for _, message in msgpack.unpacker(messages) do
     self:on_message(message)

colyseus/connection.lua

@@ -16,13 +16,44 @@ end
 
 function connection:init(endpoint)
   self._enqueuedCalls = {}
+  self.endpoint = endpoint
 
   self.is_html5 = sys.get_sys_info().system_name == "HTML5"
+  self:open()
+end
+
+function connection:loop(timeout)
+  if self.ws then
+    self.ws.step()
+    socket.select(nil, nil, timeout or 0.001)
+  end
+end
+
+function connection:send(data)
+  if self.ws and self.ws.state == "OPEN" then
+    if self.is_html5 then
+      -- binary frames are sent by default on HTML5
+      self.ws:send(msgpack.pack(data))
+
+    else
+      -- force binary frame on native platforms
+      self.ws:send(msgpack.pack(data), 0x2)
+    end
+
+  else
+    -- WebSocket not connected.
+    -- Enqueue data to be sent when readyState is OPEN
+    table.insert(self._enqueuedCalls, { 'send', { data } })
+  end
+end
+
+function connection:open()
   self.ws = websocket_async()
 
   self.ws:on_connected(function(ok, err)
     if err then
-      print(err);
+      self.state = self.ws.state
+
       self:emit('error', err)
       self:close()
 
@@ -42,35 +73,11 @@ function connection:init(endpoint)
   end)
 
   self.ws:on_disconnected(function(e)
+    self.state = self.ws.state
     self:emit("close", e)
   end)
 
-  self.ws:connect(endpoint)
-end
-
-function connection:loop(timeout)
-  if self.ws then
-    self.ws.step()
-    socket.select(nil, nil, timeout or 0.001)
-  end
-end
-
-function connection:send(data)
-  if self.ws and self.ws.state == "OPEN" then
-    if self.is_html5 then
-      -- binary frames are sent by default on HTML5
-      self.ws:send(msgpack.pack(data))
-
-    else
-      -- force binary frame on native platforms
-      self.ws:send(msgpack.pack(data), 0x2)
-    end
-
-  else
-    -- WebSocket not connected.
-    -- Enqueue data to be sent when readyState is OPEN
-    table.insert(self._enqueuedCalls, { 'send', { data } })
-  end
+  self.ws:connect(self.endpoint)
 end
 
 function connection:close()

colyseus/room.lua

@@ -27,7 +27,6 @@ function Room:init(name, options)
 
   -- remove all listeners on leave
   self:on('leave', function()
-    self:refresh_auto_reconnection()
     self:off()
   end)
 end
@@ -62,7 +61,6 @@ function Room:on_message (message)
 
   if (code == protocol.JOIN_ROOM) then
     self.sessionId = message[2]
-    self:refresh_auto_reconnection()
     self:emit("join")
 
   elseif (code == protocol.JOIN_ERROR) then
@@ -87,10 +85,6 @@ function Room:on_message (message)
 
 end
 
-function Room:refresh_auto_reconnection()
-  storage.set_item("reconnection", self.sessionId)
-end
-
 function Room:setState (encodedState, remoteCurrentTime, remoteElapsedTime)
   local state = msgpack.unpack(encodedState)
 
@@ -104,12 +98,12 @@ function Room:patch ( binaryPatch )
   -- apply patch
   self._previousState = fossil_delta.apply(self._previousState, binaryPatch)
 
-  local data = msgpack.unpack( utils.byte_array_to_string(self._previousState) )
+  local new_state = msgpack.unpack( utils.byte_array_to_string(self._previousState) )
 
   -- trigger state callbacks
-  self:set( data )
+  self:set( new_state )
 
-  self:emit("statechange", self.data)
+  self:emit("statechange", self.state)
 end
 
 function Room:leave()

colyseus/state_listener/state_container.lua

@@ -25,17 +25,17 @@ end
 StateContainer = {}
 local StateContainer_mt = { __index = StateContainer }
 
-function StateContainer.new (data)
+function StateContainer.new (state)
   local instance = EventEmitter:new({
     defaultListener = nil,
   })
   setmetatable(instance, StateContainer_mt)
-  instance:init(data)
+  instance:init(state)
   return instance
 end
 
-function StateContainer:init (data)
-  self.data = data or {}
+function StateContainer:init (state)
+  self.state = state or {}
 
   self.matcherPlaceholders = {}
   self.matcherPlaceholders[":id"] = "^([%a%d-_]+)$"
@@ -47,18 +47,18 @@ function StateContainer:init (data)
   self:reset()
 end
 
-function StateContainer:set (new_data)
-  local patches = compare(self.data, new_data)
-  self:check_patches(patches)
-  self.data = new_data
+function StateContainer:set (new_state)
+  local patches = compare(self.state, new_state)
+  self:check_patches(patches, self._listeners, self.defaultListener)
+  self.state = new_state
   return patches
 end
 
 function StateContainer:register_placeholder (placeholder, matcher)
   self.matcherPlaceholders[placeholder] = matcher
 end
 
-function StateContainer:listen (segments, callback)
+function StateContainer:listen (segments, callback, immediate)
   local rules
 
   if type(segments) == "function" then
@@ -91,6 +91,10 @@ function StateContainer:listen (segments, callback)
     table.insert(self._listeners, listener)
   end
 
+  if immediate then
+    self:check_patches(compare({}, self.state), { listener })
+  end
+
   return listener
 end
 
@@ -106,16 +110,14 @@ function StateContainer:remove_all_listeners ()
   self:reset()
 end
 
-function StateContainer:check_patches (patches)
-  -- for (let i = patches.length - 1; i >= 0; i--) {
+function StateContainer:check_patches (patches, listeners, default_listener)
   for i = #patches, 1, -1 do
     local matched = false
 
-    -- for (let j = 0, len = this._listeners.length; j < len; j++) {
     local j = 1
-    local total = #self._listeners
+    local total = #listeners
     while j <= total do
-      local listener = self._listeners[j]
+      local listener = listeners[j]
       local path_variables = listener and self:get_path_variables(patches[i], listener)
 
       if path_variables then
@@ -132,8 +134,8 @@ function StateContainer:check_patches (patches)
     end
 
     -- check for fallback listener
-    if (not matched and self.defaultListener) then
-      self.defaultListener["callback"](patches[i])
+    if (not matched and default_listener) then
+      default_listener["callback"](patches[i])
     end
 
   end