dima-exe-juggernaut 0.5.9.25 → 0.5.9.26

data/lib/juggernaut/client.rb

@@ -39,20 +39,20 @@ module Juggernaut
       end
 
       def find_by_signature(signature)
-        # signature should be unique
-        find do |client| 
+       # signature should be unique
+        find do |client|
           client.connections.select { |connection| connection.signature == signature }.any?
         end.first
       end
 
       def find_by_channels(channels)
-        find do |client| 
+        find do |client|
           client.has_channels?(channels)
         end
       end
 
       def find_by_id_and_channels(id, channels)
-        find do |client| 
+        find do |client|
           client.has_channels?(channels) && client.id == id
         end.first
       end
@@ -101,7 +101,7 @@ module Juggernaut
 
     def to_json
       {
-        :client_id  => @id, 
+        :client_id  => @id,
         :num_connections => @connections.size,
         :session_id => @session_id
       }.to_json
@@ -135,7 +135,7 @@ module Juggernaut
       return true unless options[:logout_url]
       post_request(options[:logout_url], [ ], :timeout => options[:post_request_timeout] || 5)
     end
-    
+
     def remove_connection(connection)
       @connections.delete(connection)
       self.reset_logout_timeout!
@@ -159,9 +159,14 @@ module Juggernaut
 
       logger.debug("Sending #{@length} queued message(s) to client #{friendly_id}")
 
+      req = connection.instance_variable_get("@request")
       @length.times do |id|
         message = @messages[id]
-        send_message_to_connection(connection, message[:message], message[:channels])
+        n = (req &&
+             req[:timestamp].to_f > 0.0 &&
+             (req[:timestamp].to_f + 0.0001) >= message[:timestamp].to_f)
+        next if n
+        send_message_to_connection(connection, message[:message], message[:channels], message[:timestamp]) if connection.alive?
       end
     end
 
@@ -231,7 +236,7 @@ module Juggernaut
         logger.error("#{url.to_s} timeout")
         return false
       end
-    end  
+    end
 
     def send_message_to_connections(msg, channels)
       @connections.each do |connection|
@@ -239,8 +244,8 @@ module Juggernaut
       end
     end
 
-    def send_message_to_connection(connection, msg, channels)
-      connection.broadcast(msg) if !channels or channels.empty? or connection.has_channels?(channels)
+    def send_message_to_connection(connection, msg, channels, timestamp = nil)
+      connection.broadcast(msg, timestamp) if !channels or channels.empty? or connection.has_channels?(channels)
     end
 
     # Queued messages are stored until a timeout is reached which is the
@@ -249,7 +254,8 @@ module Juggernaut
     # clicking off one page and loading the next one.
     def store_message(msg, channels)
       self.expire_queued_messages!
-      @messages << { :channels => channels, :message => msg, :timeout => Time.now + options[:timeout] }
+      @messages << { :channels => channels, :message => msg, :timeout => Time.now + options[:timeout], :timestamp => Time.now.to_f }
+      @messages
     end
 
     def expire_queued_messages!

data/lib/juggernaut/message.rb

@@ -4,16 +4,21 @@ module Juggernaut
     attr_accessor :signature
     attr_accessor :body
     attr_reader   :created_at
-    
-    def initialize(id, body, signature)
+
+    def initialize(id, body, signature, utime = nil)
      @id         = id
      @body       = body
      @signature  = signature
      @created_at = Time.now
+     @timestamp  = utime
     end
-    
+
+    def timestamp
+      @timestamp || @created_at.to_f.to_s
+    end
+
     def to_s
-      { :id => @id.to_s, :body => @body, :signature => @signature }.to_json
+      { :id => @id.to_s, :body => @body, :signature => @signature, :timestamp => timestamp.to_s }.to_json
     end
   end
-end
+end

data/lib/juggernaut/server.rb

@@ -54,6 +54,7 @@ module Juggernaut
     attr_reader   :channels
     attr_reader   :client
 
+
     # EM methods
 
     def post_init
@@ -186,8 +187,8 @@ module Juggernaut
 
     # Connection methods
 
-    def broadcast(bdy)
-      msg = Juggernaut::Message.new(@current_msg_id += 1, bdy, self.signature)
+    def broadcast(bdy, timestamp = nil)
+      msg = Juggernaut::Message.new(@current_msg_id += 1, bdy, self.signature, timestamp)
       publish(msg)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dima-exe-juggernaut
 version: !ruby/object:Gem::Version 
-  version: 0.5.9.25
+  version: 0.5.9.26
 platform: ruby
 authors: 
 - Alex MacCaw