bitfinex-rb 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f98705af5686620a50f19b70af4517b27929805f
-  data.tar.gz: 773bd8c26607e2b97b793e55cec026263db4431a
+  metadata.gz: 46ee71e43fbb35d759d014160cc96741cdc47792
+  data.tar.gz: ef983747170bef41e16726e5da0861a18f69ae5e
 SHA512:
-  metadata.gz: d27cde05902958afbd58a906706f4d2a1bd6b23daffe391d40a4d711f8bca51bc057665668ad621f92788b2f3b33f1540ae2a4908cf4d5599f843654b3f2a54e
-  data.tar.gz: 7dd15690bbffc2793114a7567bdf3d7a104a940ecd9e4b36689f9eebab49fe67936e63b9496b36155c6543bc21bf56eadf46bfd4d8763844e5de7a2aff6037bd
+  metadata.gz: 35c46bb6615f8d165e82962ea07a1a77a33fa643e2fbe272786e0f9fca39ece845506e72d93f664a800d2975625d808296055f81d5eb212702d69ecce2c9a5f6
+  data.tar.gz: d6769f99ae45bacfe5aaac84d3a14b00f66f9c16abaa2664f6334bccc8c67a416378526ac27f5c336c463ff8eb0335873d0d6c7602f28c6b4ce16740c25f2cf6

data/lib/bitfinex-api-rb.rb

@@ -0,0 +1 @@
+require_relative "./bitfinex.rb"

data/lib/bitfinex/configurable.rb

@@ -20,11 +20,16 @@ module Bitfinex
   end
 
   class Configuration
-    attr_accessor :api_endpoint, :debug, :debug_connection, :secret, :api_key, :websocket_api_endpoint, :rest_timeout, :rest_open_timeout
+    attr_accessor :api_endpoint, :debug, :debug_connection, :secret
+    attr_accessor :api_key, :websocket_api_endpoint, :rest_timeout
+    attr_accessor :reconnect, :reconnect_after, :rest_open_timeout
+
     def initialize
       self.api_endpoint = "https://api.bitfinex.com/v1/"
-      self.websocket_api_endpoint = "wss://api2.bitfinex.com:3000/ws"
+      self.websocket_api_endpoint = "wss://api.bitfinex.com/ws"
       self.debug = false
+      self.reconnect = true
+      self.reconnect_after = 60
       self.rest_timeout = 30
       self.rest_open_timeout = 30
       self.debug_connection = false

data/lib/bitfinex/errors.rb

@@ -6,6 +6,7 @@ module Bitfinex
   class InvalidAuthKeyError < ClientError; end
   class BlockMissingError < ParamsError; end
   class ServerError < Exception; end # Error reported back by Binfinex server
+  class ConnectionClosed < Exception; end
   class BadRequestError < ServerError; end
   class NotFoundError < ServerError; end
   class ForbiddenError < ServerError; end

data/lib/bitfinex/version.rb

@@ -1,3 +1,3 @@
 module Bitfinex
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/lib/bitfinex/websocket_connection.rb

@@ -10,7 +10,7 @@ module Bitfinex
       listen
       ws_client.run!
     end
-  
+
     def ws_send(msg)
       ws_client.send msg
     end
@@ -28,7 +28,7 @@ module Bitfinex
         add_callback(:auth, &block)
         save_channel_id(:auth, 0)
         ws_safe_send({
-          apiKey: config.api_key, 
+          apiKey: config.api_key,
           authSig: sign(payload),
           authPayload: payload,
           event: 'auth'
@@ -40,8 +40,8 @@ module Bitfinex
     def ws_unauth
       ws_safe_send({event: 'unauth'})
     end
-  
-    private 
+
+    private
 
     def ws_reset_channels
       @chan_ids = []
@@ -50,25 +50,30 @@ module Bitfinex
     end
 
     def ws_client
-      @ws_client ||= WSClient.new(url:config.websocket_api_endpoint)
+      options = {
+        url: config.websocket_api_endpoint,
+        reconnect: config.reconnect,
+        reconnect_after: config.reconnect_after
+      }
+      @ws_client ||= WSClient.new(options)
     end
-  
+
     def chan_ids
       @chan_ids ||= []
-    end 
-  
+    end
+
     def ws_open
       @ws_open ||= false
     end
-  
+
     def ws_registration_messages
       @ws_registration_messages ||= []
     end
-  
+
     def callbacks
       @callbacks ||= {}
     end
-  
+
     def add_callback(channel, &block)
       callbacks[channel] = { block: block, chan_id: nil }
     end
@@ -84,7 +89,7 @@ module Bitfinex
       else
         ws_registration_messages.push msg
       end
-    end 
+    end
 
     def register_channel(msg, &block)
       add_callback(fingerprint(msg),&block)
@@ -94,38 +99,38 @@ module Bitfinex
         ws_registration_messages.push msg.merge(event: 'subscribe')
       end
     end
-  
+
     def fingerprint(msg)
       msg.reject{|k,v| [:event,'chanId','event'].include?(k) }.
           inject({}){|h, (k,v)| h[k.to_sym]=v.to_s; h}
     end
-  
+
     def listen
       ws_client.on(:message) do |rmsg|
          msg = JSON.parse(rmsg)
          if msg.kind_of?(Hash) && msg["event"] == "subscribed"
-           save_channel_id(fingerprint(msg), msg["chanId"]) 
+           save_channel_id(fingerprint(msg), msg["chanId"])
          elsif msg.kind_of?(Array)
            exec_callback_for(msg)
          end
       end
     end
-  
+
     def save_channel_id(chan,id)
       callbacks[chan][:chan_id] = id
       chan_ids[id.to_i] = chan
     end
-  
+
     def exec_callback_for(msg)
       return if msg[1] == 'hb' #ignore heartbeat
       id = msg[0]
       callbacks[chan_ids[id.to_i]][:block].call(msg)
     end
-  
+
     def subscribe_to_channels
-      ws_client.on(:open) do 
+      ws_client.on(:open) do
         @ws_open = true
-        ws_registration_messages.each do |msg| 
+        ws_registration_messages.each do |msg|
           ws_client.send(msg)
         end
       end
@@ -134,15 +139,17 @@ module Bitfinex
     class WSClient
       def initialize(options = {})
         # set some defaults
-        @url = options[:url] || 'ws://dev2.bitfinex.com:3001/ws'
-        @reconnect = options[:reconenct] || false
+        @url = options[:url] || 'wss://api.bitfinex.com/ws'
+        @reconnect = options[:reconnect] || false
+        @reconnect_after = options[:reconnect_after] || 30
+        @stop = false
       end
-    
+
       def on(msg, &blk)
         ivar = "@#{msg}_cb"
         instance_variable_set(ivar.to_sym, blk)
       end
-    
+
       def run!
         if EventMachine.reactor_running?
           connect!
@@ -150,38 +157,51 @@ module Bitfinex
           EM.run { connect! }
         end
       end
-    
+
       def stop!
+        @stop = true
         @ws.close
       end
-    
+
       def connect!
+        @stop = false
         @ws = Faye::WebSocket::Client.new(@url)
         @ws.onopen = method(:ws_opened)
         @ws.onmessage = method(:ws_receive)
         @ws.onclose = method(:ws_closed)
         @ws.onerror = method(:ws_error)
       end
-    
+
       def send(msg)
+        raise ConnectionClosed if stopped?
+        connect! unless alive?
         msg = msg.is_a?(Hash) ? msg.to_json : msg
         @ws.send(msg)
       end
-    
+
+      def alive?
+        @ws && @ws.ready_state == Faye::WebSocket::API::OPEN
+      end
+
+      def stopped?
+        @stop
+      end
+
       private
-    
+
       def ws_opened(event)
         @open_cb.call(event) if @open_cb
       end
-    
+
       def ws_receive(event)
         @message_cb.call(event.data) if @message_cb
       end
-    
-      def ws_closed(_event)
-        EM.stop
-          end
-    
+
+      def ws_closed(event)
+        return unless @reconnect
+        EM.add_timer(@reconnect_after){ connect! } unless @stop
+      end
+
       def ws_error(event)
         fail event
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitfinex-rb
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Bitfinex
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-27 00:00:00.000000000 Z
+date: 2017-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -131,6 +131,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/bitfinex-api-rb.rb
 - lib/bitfinex.rb
 - lib/bitfinex/account_info.rb
 - lib/bitfinex/authenticated_rest.rb