bitflyer 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7e97040225bbcb8c03f0b30d2cc7e99f961b26b8
-  data.tar.gz: 635e649a96a37e01cc7c7adb6cdc199cea09cc41
+SHA256:
+  metadata.gz: 96469fe331a89e6551b43e7224b0eb9dbe7e21a5f6c6811068d1fcbdc6d73472
+  data.tar.gz: 4480a1a3aa087333adf60e31b60c90d568a403b43acd348aac0d60c3f8de1c65
 SHA512:
-  metadata.gz: 5c2169cd4ee452ecdef914b95c35d0d01a42f9dc4cf55e2b32dce3f741da641d3684b0aa049e5a5db4b9700c7ab464b1c88b7bcde89e2b39c368570ba4e73e8e
-  data.tar.gz: c678a6b2ca82f303ec2d7c02c192bde247e144328e2feed5b3d3e9dac813f66ce638664cf38ffbca3f5d75789bdef6559fe459132b2b95a8d36296d6d7b7cda9
+  metadata.gz: 21ad55e0aedf232c88aa20ed7bc49ebe5f3a92acff3dfe18772bb4d4b6576f07f7fad79926372f6fe2ca840175064b75fef6db767e246d882d4624845082bd9c
+  data.tar.gz: 95570ef23a9d6a6abb4667406a7fe19b41e81ec0b3e0cfd433d1d77b2df9a3f2224616eb5c4ae92abcc8ede4769953cd7c060ec0e7da4b5d35bc9ca6ab7e156f

data/Gemfile.lock

@@ -1,74 +1,21 @@
 PATH
   remote: .
   specs:
-    bitflyer (0.2.0)
+    bitflyer (0.2.1)
       faraday (~> 0.14.0)
       faraday_middleware (~> 0.12.0)
-      pubnub (~> 4.0.22)
+      websocket-client-simple (~> 0.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    celluloid (0.17.3)
-      celluloid-essentials
-      celluloid-extras
-      celluloid-fsm
-      celluloid-pool
-      celluloid-supervision
-      timers (>= 4.1.1)
-    celluloid-essentials (0.20.5)
-      timers (>= 4.1.1)
-    celluloid-extras (0.20.5)
-      timers (>= 4.1.1)
-    celluloid-fsm (0.20.5)
-      timers (>= 4.1.1)
-    celluloid-pool (0.20.5)
-      timers (>= 4.1.1)
-    celluloid-supervision (0.20.6)
-      timers (>= 4.1.1)
-    concurrent-ruby (1.0.5)
     diff-lcs (1.3)
-    dry-configurable (0.7.0)
-      concurrent-ruby (~> 1.0)
-    dry-container (0.6.0)
-      concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.4.2)
-      concurrent-ruby (~> 1.0)
-    dry-equalizer (0.2.0)
-    dry-logic (0.4.2)
-      dry-container (~> 0.2, >= 0.2.6)
-      dry-core (~> 0.2)
-      dry-equalizer (~> 0.2)
-    dry-types (0.12.2)
-      concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.1)
-      dry-container (~> 0.3)
-      dry-core (~> 0.2, >= 0.2.1)
-      dry-equalizer (~> 0.2)
-      dry-logic (~> 0.4, >= 0.4.2)
-      inflecto (~> 0.0.0, >= 0.0.2)
-    dry-validation (0.11.1)
-      concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.1, >= 0.1.3)
-      dry-core (~> 0.2, >= 0.2.1)
-      dry-equalizer (~> 0.2)
-      dry-logic (~> 0.4, >= 0.4.0)
-      dry-types (~> 0.12.0)
+    event_emitter (0.2.6)
     faraday (0.14.0)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
-    hitimes (1.2.6)
-    httpclient (2.8.3)
-    inflecto (0.0.2)
-    json (2.1.0)
     multipart-post (2.0.0)
-    pubnub (4.0.27)
-      celluloid (~> 0.17)
-      dry-validation (~> 0.10)
-      httpclient (~> 2.8, >= 2.8.3)
-      json (>= 1.8, < 3)
     rake (12.3.0)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
@@ -83,8 +30,10 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
-    timers (4.1.2)
-      hitimes
+    websocket (1.2.8)
+    websocket-client-simple (0.3.0)
+      event_emitter
+      websocket
 
 PLATFORMS
   ruby
@@ -96,4 +45,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   1.15.4
+   1.17.2

data/bitflyer.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'faraday', '~> 0.14.0'
   spec.add_dependency 'faraday_middleware', '~> 0.12.0'
-  spec.add_dependency 'pubnub', '~> 4.0.22'
+  spec.add_dependency 'websocket-client-simple', '~> 0.3.0'
   spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'

data/lib/bitflyer/realtime/client.rb

@@ -1,8 +1,7 @@
-require 'pubnub'
+require_relative './websocket'
 
 module Bitflyer
   module Realtime
-    PUBNUB_SUBSCRIBE_KEY = 'sub-c-52a9ab50-291b-11e5-baaa-0619f8945a4f'.freeze
     CHANNEL_NAMES = [
         'lightning_board_snapshot_BTC_JPY',
         'lightning_board_snapshot_FX_BTC_JPY',
@@ -22,25 +21,20 @@ module Bitflyer
         'lightning_executions_BCH_BTC'
     ].freeze
 
-    class Client
-      attr_accessor *Realtime::CHANNEL_NAMES.map { |name| name.gsub('lightning_', '').downcase.to_sym }
+    SOCKET_HOST = 'https://io.lightstream.bitflyer.com'
 
-      def initialize
-        @pubnub = Pubnub.new(subscribe_key: Realtime::PUBNUB_SUBSCRIBE_KEY)
+    class Client
+      attr_accessor :websocket_client, :ping_interval, :ping_timeout, :last_ping_at, :last_pong_at
 
-        @callback = Pubnub::SubscribeCallback.new(
-            message: ->(envelope) {
-              channel_name = envelope.result[:data][:subscribed_channel].gsub('lightning_', '').downcase.to_sym
-              message = envelope.result[:data][:message]
-              send(channel_name).call(message) if send(channel_name)
-            },
-            presence: ->(envelope) {},
-            status: ->(envelope) {}
-        )
+      Realtime::CHANNEL_NAMES.each do |channel_name|
+        define_method "#{channel_name.gsub('lightning_', '').downcase.to_sym}=" do |callback|
+          @websocket_client.subscribe(channel_name: channel_name.to_sym, &callback)
+        end
+      end
 
-        @pubnub.add_listener(callback: @callback)
-        @pubnub.subscribe(channels: Realtime::CHANNEL_NAMES)
+      def initialize
+        @websocket_client = Bitflyer::Realtime::WebSocketClient.new(host: SOCKET_HOST)
       end
     end
   end
-end
+end

data/lib/bitflyer/realtime/websocket.rb

@@ -0,0 +1,136 @@
+require 'websocket-client-simple'
+
+module Bitflyer
+  module Realtime
+    class WebSocketClient
+      attr_accessor :websocket_client, :channel_name, :channel_callbacks, :ping_interval, :ping_timeout,
+        :last_ping_at, :last_pong_at, :error
+
+      def initialize(host:, debug: false)
+        @host = host
+        @debug = debug
+        @error = nil
+        @channel_names = []
+        @channel_callbacks = {}
+        connect
+      end
+
+      def subscribe(channel_name:, &block)
+        debug_log "Subscribe #{channel_name}"
+        @channel_names = (@channel_names + [channel_name]).uniq
+        @channel_callbacks[channel_name] = block
+        websocket_client.send "42#{['subscribe', channel_name].to_json}"
+      end
+
+      def connect
+        @websocket_client = WebSocket::Client::Simple.connect "#{@host}/socket.io/?transport=websocket"
+        this = self
+
+        Thread.new do
+          loop do
+            sleep 1
+            if @websocket_client && @websocket_client.open?
+              send_ping
+              wait_pong
+            end
+          end
+        end
+
+        Thread.new do
+          loop do
+            sleep 1
+            next unless @error
+            reconnect
+          end
+        end
+
+        @websocket_client.on(:message) { |payload| this.handle_message(payload: payload) }
+        @websocket_client.on(:error) { |error| this.handle_error(error: error) }
+      end
+
+      def send_ping
+        return unless @last_ping_at && @ping_interval
+        return unless Time.now.to_i - @last_ping_at > @ping_interval / 1000
+
+        debug_log 'Sent ping'
+        @websocket_client.send "2"
+        @last_ping_at = Time.now.to_i
+      end
+
+      def wait_pong
+        return unless @last_pong_at && @ping_timeout
+        return unless Time.now.to_i - @last_pong_at > @ping_timeout / 1000
+
+        debug_log 'Timed out waiting pong'
+        @websocket_client.close
+      end
+
+      def reconnect
+        return unless @error
+        debug_log 'Reconnecting...'
+
+        @error = nil
+        @websocket_client.close if @websocket_client.open?
+        connect
+        @channel_names.each do |channel_name|
+          debug_log "42#{{ subscribe: channel_name }.to_json}"
+          websocket_client.send "42#{['subscribe', channel_name].to_json}"
+        end
+      end
+
+      def handle_error(error:)
+        debug_log error
+        return unless error.kind_of? Errno::ECONNRESET
+        reconnect
+      end
+
+      def handle_message(payload:)
+        debug_log payload.data
+        return unless payload.data =~ /^\d+/
+        code, body = payload.data.scan(/^(\d+)(.*)$/)[0]
+
+        case code.to_i
+        when 0 then setup_by_response(json: body)
+        when 3 then receive_pong
+        when 41 then disconnect
+        when 42 then emit_message(json: body)
+        end
+      rescue => e
+        puts e
+        puts e.backtrace.join("\n")
+      end
+
+      def setup_by_response(json:)
+        body = JSON.parse json
+        @ping_interval = body["pingInterval"].to_i || 25000
+        @ping_timeout  = body["pingTimeout"].to_i || 60000
+        @last_ping_at = Time.now.to_i
+        @last_pong_at = Time.now.to_i
+        channel_callbacks.each do |channel_name, _|
+          websocket_client.send "42#{['subscribe', channel_name].to_json}"
+        end
+      end
+
+      def receive_pong
+        debug_log 'Received pong'
+        @last_pong_at = Time.now.to_i
+      end
+
+      def disconnect
+        debug_log 'Disconnecting from server...'
+        @error = true
+      end
+
+      def emit_message(json:)
+        channel_name, *messages = JSON.parse json
+        return unless channel_name
+        messages.each { |message| @channel_callbacks[channel_name.to_sym]&.call(message) }
+      end
+
+      def debug_log(message)
+        return unless @debug
+        p message
+      end
+    end
+  end
+end

data/lib/bitflyer/version.rb

@@ -1,3 +1,3 @@
 module Bitflyer
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitflyer
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Yuji Ueki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-30 00:00:00.000000000 Z
+date: 2019-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.12.0
 - !ruby/object:Gem::Dependency
-  name: pubnub
+  name: websocket-client-simple
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.22
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.22
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +114,7 @@ files:
 - lib/bitflyer/http/public.rb
 - lib/bitflyer/realtime.rb
 - lib/bitflyer/realtime/client.rb
+- lib/bitflyer/realtime/websocket.rb
 - lib/bitflyer/version.rb
 homepage: https://github.com/unhappychoice/bitflyer
 licenses:
@@ -135,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Bitflyer API wrapper