rename DeltaContainer to StateContainer. fix socket timeout argument on connection loop.

Author: endel

colyseus/client.lua

@@ -50,6 +50,12 @@ function client:init(endpoint)
 
   self.connection = self:create_connection()
 
+  self.connection:on("open", function()
+    if get_colyseus_id() ~= nil then
+      self:emit("open")
+    end
+  end)
+
   self.connection:on("message", function(message)
     self:on_batch_message(message)
   end)
@@ -90,11 +96,11 @@ function client:create_connection(path, options)
   return Connection.new(self.hostname .. path .. "?" .. table.concat(params, "&"))
 end
 
-function client:loop()
-  self.connection:loop()
+function client:loop(timeout)
+  self.connection:loop(timeout)
 
   for k, room in pairs(self.rooms) do
-    room:loop()
+    room:loop(timeout)
   end
 end
 
@@ -111,7 +117,7 @@ function client:join(...)
   self.requestId = self.requestId + 1
   options.requestId = self.requestId;
 
-  local room = Room.create(roomName, options);
+  local room = Room.create(roomName, options)
 
   -- remove references on leaving
   room:on("leave", function()
@@ -133,7 +139,6 @@ function client:on_batch_message(messages)
 end
 
 function client:on_message(message)
-
   if type(message[1]) == "number" then
     local roomId = message[2]
 
@@ -152,8 +157,8 @@ function client:on_message(message)
         return
       end
 
-      room.id = roomId;
-      room:connect( self:create_connection(room.id, room.options) );
+      room.id = roomId
+      room:connect( self:create_connection(room.id, room.options) )
 
       self.rooms[room.id] = room
       self.connectingRooms[ requestId ] = nil;

colyseus/connection.lua

@@ -3,7 +3,6 @@ local EventEmitter = require('colyseus.eventemitter')
 
 local msgpack = require('colyseus.messagepack.MessagePack')
 local websocket_async = require "websocket.client_async"
--- local websocket_async = require "websocket.client_sync"
 
 local connection = {}
 connection.__index = connection
@@ -23,6 +22,7 @@ function connection:init(endpoint)
 
   self.ws:on_connected(function(ok, err)
     if err then
+      print(err);
       self:emit('error', err)
       self:close()
 
@@ -42,18 +42,16 @@ function connection:init(endpoint)
   end)
 
   self.ws:on_disconnected(function(e)
-    print("DISCONNECTED!")
-    pprint(e)
     self:emit("close", e)
   end)
 
   self.ws:connect(endpoint)
 end
 
-function connection:loop()
+function connection:loop(timeout)
   if self.ws then
     self.ws.step()
-    socket.select(nil, nil, 0.5)
+    socket.select(nil, nil, timeout or 0.001)
   end
 end
 

colyseus/room.lua

@@ -2,22 +2,22 @@ local msgpack = require('colyseus.messagepack.MessagePack')
 local fossil_delta = require('colyseus.fossil_delta.fossil_delta')
 
 local protocol = require('colyseus.protocol')
-local DeltaContainer = require('colyseus.delta_listener.delta_container')
+local StateContainer = require('colyseus.state_listener.state_container')
 
 local utils = require('colyseus.utils')
 
 Room = {}
 Room.__index = Room
 
 function Room.create(name)
-  local room = DeltaContainer.new()
+  local room = StateContainer.new()
   setmetatable(room, Room)
   room:init(name)
   return room
 end
 
--- inherits from DeltaContainer
-setmetatable(Room, { __index = DeltaContainer })
+-- inherits from StateContainer
+setmetatable(Room, { __index = StateContainer })
 
 function Room:init(name, options)
   self.id = nil
@@ -41,9 +41,9 @@ function Room:connect (connection)
   end)
 end
 
-function Room:loop ()
+function Room:loop (timeout)
   if self.connection ~= nil then
-    self.connection:loop()
+    self.connection:loop(timeout)
   end
 end
 

colyseus/delta_listener/compare.lua renamed to colyseus/state_listener/compare.lua

@@ -36,9 +36,9 @@ local function generate(mirror, obj, patches, path)
   local changed = false
   local deleted = false
 
-  local t = #old_keys - 1
-  while t >= 0 do
-    local key = old_keys[t + 1]
+  local t = #old_keys
+  while t > 0 do
+    local key = old_keys[t]
     local old_val = mirror[key]
 
     if obj[key] ~= nil and not (obj[key] == nil and old_val ~= nil and not is_array(obj)) then
@@ -72,8 +72,8 @@ local function generate(mirror, obj, patches, path)
       return
   end
 
-  t = 1
-  while t <= #new_keys do
+  t = #new_keys
+  while t > 0 do
     local key = new_keys[t]
 
     if mirror[key] == nil and obj[key] ~= nil then
@@ -92,7 +92,7 @@ local function generate(mirror, obj, patches, path)
       })
     end
 
-    t = t + 1
+    t = t - 1
   end
 end
 

colyseus/delta_listener/delta_container.lua renamed to colyseus/state_listener/state_container.lua

@@ -1,4 +1,4 @@
-local compare = require('colyseus.delta_listener.compare')
+local compare = require('colyseus.state_listener.compare')
 local EventEmitter = require('colyseus.eventemitter')
 
 local function split(str, delimiter)
@@ -22,19 +22,19 @@ local function map(array, func)
   return new_array
 end
 
-DeltaContainer = {}
-local DeltaContainer_mt = { __index = DeltaContainer }
+StateContainer = {}
+local StateContainer_mt = { __index = StateContainer }
 
-function DeltaContainer.new (data)
+function StateContainer.new (data)
   local instance = EventEmitter:new({
     defaultListener = nil,
   })
-  setmetatable(instance, DeltaContainer_mt)
+  setmetatable(instance, StateContainer_mt)
   instance:init(data)
   return instance
 end
 
-function DeltaContainer:init (data)
+function StateContainer:init (data)
   self.data = data or {}
 
   self.matcherPlaceholders = {}
@@ -47,18 +47,18 @@ function DeltaContainer:init (data)
   self:reset()
 end
 
-function DeltaContainer:set (new_data)
+function StateContainer:set (new_data)
   local patches = compare(self.data, new_data)
   self:check_patches(patches)
   self.data = new_data
   return patches
 end
 
-function DeltaContainer:register_placeholder (placeholder, matcher)
+function StateContainer:register_placeholder (placeholder, matcher)
   self.matcherPlaceholders[placeholder] = matcher
 end
 
-function DeltaContainer:listen (segments, callback)
+function StateContainer:listen (segments, callback)
   local rules
 
   if type(segments) == "function" then
@@ -94,19 +94,19 @@ function DeltaContainer:listen (segments, callback)
   return listener
 end
 
-function DeltaContainer:remove_listener (listener)
+function StateContainer:remove_listener (listener)
   for k, l in ipairs(self._listeners) do
     if l == listener then
       table.remove(self._listeners, k)
     end
   end
 end
 
-function DeltaContainer:remove_all_listeners ()
+function StateContainer:remove_all_listeners ()
   self:reset()
 end
 
-function DeltaContainer:check_patches (patches)
+function StateContainer:check_patches (patches)
   -- for (let i = patches.length - 1; i >= 0; i--) {
   for i = #patches, 1, -1 do
     local matched = false
@@ -139,7 +139,7 @@ function DeltaContainer:check_patches (patches)
   end
 end
 
-function DeltaContainer:get_path_variables (patch, listener)
+function StateContainer:get_path_variables (patch, listener)
   -- skip if rules count differ from patch
 
   if #patch.path ~= #listener.rules then
@@ -167,8 +167,8 @@ function DeltaContainer:get_path_variables (patch, listener)
   return path
 end
 
-function DeltaContainer:reset ()
+function StateContainer:reset ()
   self._listeners = {}
 end
 
-return DeltaContainer
+return StateContainer