deepstream 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9710ea0aad1261115011ffd5f931a228d82d4ac
-  data.tar.gz: 8681f3f32c6351a7339532ddcf65f37b3606f9d8
+  metadata.gz: dd6d503c71516f071673b0c63d6ed0c3ecd0e055
+  data.tar.gz: 4e5087ecdc7b0420b0bccac544a6e1c0a7aa91d0
 SHA512:
-  metadata.gz: 0e0f9e98828eef58e5e92f613eaec2f896252cbe441aff59d096c9baa17b995cc7bf4dc7a4c6e69da257272deb05574a217bb0805f67590de6e7d0c0510aad5f
-  data.tar.gz: 79b04bcc09fa5fb50965551fe9e4e6dc18e5e1259106559f37a893188c18f940568735eb2a7bd0bf9f6ca548ca81fa037e54fac7ac9216a8f41a00fe60a074b5
+  metadata.gz: 88de53ede59b95a78f1f596d2aac53a86e43a789745bf42fd97f24351e0ec4d73d39077b49198931728d34b7721a2faed4c48e50b18b79685acc4b8286452bec
+  data.tar.gz: 1580071ce6dbbf29a2a7993348c243b69fea9da758b5c5e3f6aab705fdcb0574f2c2cbd093841e16210899f26e5d463c5c6e88290fbef92673f3ed46aae76751

data/deepstream.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "deepstream"
-  spec.version       = "0.1.3"
+  spec.version       = "0.1.4"
   spec.authors       = ["Currency-One S.A."]
   spec.email         = ["piotr.szczudlak@currency-one.com"]
 

data/lib/deepstream.rb

@@ -28,11 +28,16 @@ class Deepstream::Record
 
   def set(*args)
     if args.size == 1
-      @client._write('R', 'U', @name, (@version += 1), JSON.dump(args[0]))
-      @data = OpenStruct.new(args[0])
+      if @client._write('R', 'U', @name, (@version += 1), JSON.dump(args[0]))
+        @data = OpenStruct.new(args[0])
+      end
     else
       @client._write('R', 'P', @name, (@version += 1), args[0][0..-2], @client._typed(args[1]))
+      @data[args[0][0..-2]] = args[1]
     end
+  rescue => e
+    print "unable to set\n"
+    print "Error: ", e.message, "\n" if @client.verbose
   end
 
   def _patch(version, field, value)
@@ -48,19 +53,22 @@ class Deepstream::Record
   def method_missing(name, *args)
     unless @data.is_a?(Array)
       set(name, *args) if name[-1] == '='
-      @data.send(name, *args)
+      @data[name] || @data[name[-1]]
     end
   end
 end
 
 class Deepstream::List < Deepstream::Record
   def add(record_name)
-    if @data.is_a?(Array)
-      @data.push record_name unless @data.include? record_name
-    else
-      @data = [record_name]
+    @data = [] unless @data.is_a?(Array)
+    unless @data.include? record_name
+      @data.push record_name
+      @client._write('R', 'U', @name, (@version += 1), JSON.dump(@data))
     end
-    @client._write('R', 'U', @name, (@version += 1), JSON.dump(@data))
+    @data
+  rescue => e
+    print "unable to add ", @data.pop, "\n"
+    print "Error: ", e.message, "\n" if @client.verbose
     @data
   end
 
@@ -68,6 +76,11 @@ class Deepstream::List < Deepstream::Record
     @data.delete_if { |x| x == record_name }
     @client._write('R', 'U', @name, (@version += 1), JSON.dump(@data))
     @data
+  rescue => e
+    print "unable to remove ", record_name, "\n"
+    @data.push record_name
+    print "Error: ", e.message, "\n" if @client.verbose
+    @data
   end
 
   def all
@@ -84,14 +97,74 @@ class Deepstream::List < Deepstream::Record
 end
 
 class Deepstream::Client
-  def initialize(address, port = 6021)
-    @address, @port, @unread_msg, @event_callbacks, @records = address, port, nil, {}, {}
+  def initialize(address, port = 6021, credentials = {})
+    @address, @port, @unread_msg, @event_callbacks, @records, @max_timeout, @timeout = address, port, nil, {}, {}, 60, 1
+    connect(credentials)
+  end
+
+  attr_accessor :verbose, :max_timeout
+  attr_reader :connected
+
+  def _login(credentials)
+    _write("A", "REQ", credentials.to_json)
+    raise unless _read_socket == %w{A A}
+  end
+
+  def _read_socket(timeout: nil)
+    Timeout.timeout(timeout) do
+      @socket.gets(30.chr).tap { |m| break m.chomp(30.chr).split(31.chr) if m }
+    end
+  end
+
+  def connect(credentials)
+    return self if @connected
+    Thread.start do
+      Thread.current[:name] = "reader#{object_id}"
+      loop do
+        break if @connected # ensures only one thread remains after reconnection
+        begin
+          Timeout.timeout(2) { @socket = TCPSocket.new(@address, @port) }
+          _login(credentials)
+          @connected = true
+          print Time.now.to_s[/.+ .+ /], "Connected\n" if @verbose
+          Thread.start do
+            _sync_records
+            _resubscribe_events
+          end
+          loop do
+            @timeout = 1
+            begin
+              _process_msg(_read_socket(timeout: 10))
+            rescue TimeoutError
+              _write("heartbeat") # send anything to check if deepstream responds
+              _process_msg(_read_socket(timeout: 10))
+            end
+          end
+        rescue => e
+          @connected = false
+          @socket.close rescue nil
+          print Time.now.to_s[/.+ .+ /], "Can't connect to deepstream server\n" if @verbose
+          print "Error: ", e.message, "\n" if @verbose
+          sleep @timeout
+          @timeout = [@timeout * 1.2, @max_timeout].min
+        end
+      end
+    end
+    sleep 0.5
+    self
+  end
+
+  def disconnect
+    @connected = false
+    @socket.close rescue nil
+    Thread.list.find { |x| x[:name] == "reader#{object_id}" }.kill
+    self
   end
 
   def emit(event, value = nil, opts = { timeout: nil })
     result = nil
     Timeout::timeout(opts[:timeout]) do
-      sleep 1 until (result = _write('E', 'EVT', event, _typed(value))) || opts[:timeout] == nil
+      sleep 1 until (result = _write('E', 'EVT', event, _typed(value)) rescue false) || opts[:timeout].nil?
     end
     result
   end
@@ -99,6 +172,9 @@ class Deepstream::Client
   def on(event, &block)
     _write_and_read('E', 'S', event)
     @event_callbacks[event] = block
+  rescue => e
+    print "Error: ", e.message, "\n" if @verbose
+    @event_callbacks[event] = block
   end
 
   def get(record_name)
@@ -107,16 +183,19 @@ class Deepstream::Client
 
   def get_record(record_name, list: nil)
     name = list ? "#{list}/#{record_name}" : record_name
+    if list
+      @records[list] ||= get_list(list)
+      @records[list].add(name)
+    end
     @records[name] ||= (
       _write_and_read('R', 'CR', name)
       msg = _read
       Deepstream::Record.new(self, name, _parse_data(msg[4]), msg[3].to_i)
     )
-    if list
-      @records[list] ||= get_list(list)
-      @records[list].add(name)
-    end
     @records[name]
+  rescue => e
+    print "Error: ", e.message, "\n" if @verbose
+    @records[name] = Deepstream::Record.new(self, name, OpenStruct.new, 0)
   end
 
   def get_list(list_name)
@@ -125,6 +204,9 @@ class Deepstream::Client
       msg = _read
       Deepstream::List.new(self, list_name, _parse_data(msg[4]), msg[3].to_i)
     )
+  rescue => e
+    print "Error: ", e.message, "\n" if @verbose
+    @records[list_name] = Deepstream::List.new(self, list_name, [], 0)
   end
 
   def delete(record_name)
@@ -133,22 +215,23 @@ class Deepstream::Client
       tmp.remove(record_name)
     end
     _write('R', 'D', record_name)
+  rescue => e
+    print "Error: ", e.message, "\n" if @verbose
+    false
   end
 
-  def _open_socket
-    Timeout.timeout(2) { @socket = TCPSocket.new(@address, @port) }
-    Thread.start do
-      loop { _process_msg(@socket.gets(30.chr).tap { |m| break m.chomp(30.chr).split(31.chr) if m }) }
+  def _resubscribe_events
+    @event_callbacks.keys.each do |event|
+      _write_and_read('E', 'S', event)
     end
-  rescue
-    print Time.now.to_s[/.+ .+ /], "Can't connect to deepstream server\n"
-    raise
   end
 
-  def _connect
-    _open_socket
-    @connected = true
-    @connected = _write_and_read(%w{A REQ {}}) { |msg| msg == %w{A A} }
+  def _sync_records
+    @records.each do |name, record|
+      _write_and_read('R', 'CR', name)
+      msg = _read
+      @records[name]._update(msg[3].to_i, _parse_data(msg[4]))
+    end
   end
 
   def _write_and_read(*args)
@@ -158,10 +241,10 @@ class Deepstream::Client
   end
 
   def _write(*args)
-    _connect unless @connected
     @socket.write(args.join(31.chr) + 30.chr)
-  rescue
-    @connected = false
+  rescue => e
+    raise "not connected" unless @connected
+    raise e
   end
 
   def _process_msg(msg)
@@ -171,7 +254,10 @@ class Deepstream::Client
     when %w{R U} then @records[msg[2]]._update(msg[3], _parse_data(msg[4]))
     when %w{R A} then @records.delete(msg[3]) if msg[2] == 'D'
     when %w{E A} then nil
-    else @unread_msg = msg
+    when %w{X E} then nil
+    when [] then nil
+    else
+      @unread_msg = msg
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deepstream
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Currency-One S.A.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-19 00:00:00.000000000 Z
+date: 2016-06-13 00:00:00.000000000 Z
 dependencies: []
 description: Basic ruby client for the deepstream.io server
 email: