bitflyer 0.2.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7e97040225bbcb8c03f0b30d2cc7e99f961b26b8
-  data.tar.gz: 635e649a96a37e01cc7c7adb6cdc199cea09cc41
+SHA256:
+  metadata.gz: 3b414a7e2a6dd054ca0aff1d217dc8c8e712f8969daa03d91dbf795e33111e94
+  data.tar.gz: cb365b45701c9a23bf6d6f7b4818f04e6eeef1e709909802feca8d62779cb7f1
 SHA512:
-  metadata.gz: 5c2169cd4ee452ecdef914b95c35d0d01a42f9dc4cf55e2b32dce3f741da641d3684b0aa049e5a5db4b9700c7ab464b1c88b7bcde89e2b39c368570ba4e73e8e
-  data.tar.gz: c678a6b2ca82f303ec2d7c02c192bde247e144328e2feed5b3d3e9dac813f66ce638664cf38ffbca3f5d75789bdef6559fe459132b2b95a8d36296d6d7b7cda9
+  metadata.gz: 66beabfdb8ba7893f44b16c41a6371b6eb0cfd131138055d6d72a02ac90af17ffa450a155c4dac0f19433705228319714111464af07159e56c7f0bd08f456b0e
+  data.tar.gz: 56ac4fe5e16694a3c4d2b4049c4fefa9b1fa7a9412133ce9c5596d9ec53dd664ccd5d155af54df3645cfab655f790105b62c18c3e73e562bd44e481f68a687d6

data/.circleci/config.yml

@@ -0,0 +1,54 @@
+version: 2.1
+
+update_bundler: &update_bundler
+  run:
+    name: update bundler
+    command: gem update bundler
+
+bundle_install: &bundle_install
+  run:
+    name: bundle install
+    command: bundle update --bundler && bundle install --path vendor/bundle --jobs 4
+
+restore_bundle_cache: &restore_bundle_cache
+  restore_cache:
+    key: cache-bundler-{{ checksum "Gemfile.lock" }}
+
+jobs:
+  build:
+    docker:
+      - image: circleci/ruby
+    steps:
+      - checkout
+      - *restore_bundle_cache
+      - *update_bundler
+      - *bundle_install
+      - save_cache:
+          key: cache-bundler-{{ checksum "Gemfile.lock" }}
+          paths:
+            - vendor/bundle
+  rubocop:
+    docker:
+      - image: circleci/ruby
+    steps:
+      - checkout
+      - *restore_bundle_cache
+      - *update_bundler
+      - *bundle_install
+      - run: bundle exec rubocop
+  rspec:
+    docker:
+      - image: circleci/ruby
+    steps:
+      - checkout
+      - *restore_bundle_cache
+      - *update_bundler
+      - *bundle_install
+      - run: bundle exec rspec
+workflows:
+  version: 2.1
+  rspec:
+    jobs:
+      - build
+      - rubocop
+      - rspec

data/.rubocop.yml

@@ -0,0 +1,10 @@
+inherit_from: .rubocop_todo.yml
+
+AllCops:
+  NewCops: enable
+  Include:
+    - 'lib/**/*.rb'
+Style/Documentation:
+  Enabled: false
+Metrics/LineLength:
+  Max: 120

data/.rubocop_todo.yml

@@ -0,0 +1,35 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2020-08-08 12:17:16 UTC using RuboCop version 0.89.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 2
+# Configuration parameters: IgnoredMethods.
+Metrics/AbcSize:
+  Max: 32
+
+# Offense count: 2
+# Configuration parameters: CountComments, CountAsOne.
+Metrics/ClassLength:
+  Max: 146
+
+# Offense count: 2
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods.
+Metrics/MethodLength:
+  Max: 20
+
+# Offense count: 3
+# Configuration parameters: CountKeywordArgs.
+Metrics/ParameterLists:
+  Max: 7
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: always, always_true, never
+Style/FrozenStringLiteralComment:
+  Exclude:
+    - 'bin/console'

data/Gemfile.lock

@@ -1,99 +1,77 @@
 PATH
   remote: .
   specs:
-    bitflyer (0.2.0)
-      faraday (~> 0.14.0)
-      faraday_middleware (~> 0.12.0)
-      pubnub (~> 4.0.22)
+    bitflyer (1.0.1)
+      faraday (>= 0.14, < 1.2)
+      faraday_middleware (>= 0.12, < 1.1)
+      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)
-    faraday (0.14.0)
+    ast (2.4.1)
+    coderay (1.1.3)
+    diff-lcs (1.4.4)
+    event_emitter (0.2.6)
+    faraday (1.1.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)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+      ruby2_keywords
+    faraday_middleware (1.0.0)
+      faraday (~> 1.0)
+    method_source (1.0.0)
+    multipart-post (2.1.1)
+    parallel (1.19.2)
+    parser (2.7.2.0)
+      ast (~> 2.4.1)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rainbow (3.0.0)
+    rake (13.0.1)
+    regexp_parser (1.8.2)
+    rexml (3.2.4)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.0)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    timers (4.1.2)
-      hitimes
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.0)
+    rubocop (1.2.0)
+      parallel (~> 1.10)
+      parser (>= 2.7.1.5)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8)
+      rexml
+      rubocop-ast (>= 1.0.1)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (1.1.1)
+      parser (>= 2.7.1.5)
+    ruby-progressbar (1.10.1)
+    ruby2_keywords (0.0.2)
+    unicode-display_width (1.7.0)
+    websocket (1.2.8)
+    websocket-client-simple (0.3.0)
+      event_emitter
+      websocket
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bitflyer!
-  bundler (~> 1.12)
+  bundler (~> 2.0)
+  pry
   rake
   rspec
+  rubocop
 
 BUNDLED WITH
-   1.15.4
+   2.0.2

data/README.md

@@ -2,8 +2,9 @@
 [![Gem Version](https://badge.fury.io/rb/bitflyer.svg)](https://badge.fury.io/rb/bitflyer)
 [![Circle CI](https://circleci.com/gh/unhappychoice/bitflyer.svg?style=shield)](https://circleci.com/gh/unhappychoice/bitflyer)
 [![Code Climate](https://codeclimate.com/github/unhappychoice/bitflyer/badges/gpa.svg)](https://codeclimate.com/github/unhappychoice/bitflyer)
-[![Dependency Status](https://gemnasium.com/badges/github.com/unhappychoice/bitflyer.svg)](https://gemnasium.com/github.com/unhappychoice/bitflyer)
+[![Libraries.io dependency status for GitHub repo](https://img.shields.io/librariesio/github/unhappychoice/bitflyer.svg)](https://libraries.io/github/unhappychoice/bitflyer)
 ![](http://ruby-gem-downloads-badge.herokuapp.com/bitflyer?type=total)
+![GitHub](https://img.shields.io/github/license/unhappychoice/bitflyer.svg)
 
 bitflyer is a wrapper interface of [Bitflyer lightning API](https://lightning.bitflyer.jp/docs)  
 
@@ -19,6 +20,8 @@ See https://lightning.bitflyer.jp/docs for details.
 
 ### HTTP API
 
+See [public.rb](./lib/bitflyer/http/public.rb) / [private.rb](./lib/bitflyer/http/private.rb) for method definition.
+
 #### Example
 
 ```ruby 
@@ -34,17 +37,7 @@ p private_client.positions # will print your positions
 Accessor format is like `{event_name}_{product_code}`.
 You can set lambda to get realtime events.
 
-#### `event_name`
-- board_snapshot
-- board
-- ticker
-- executions
-
-#### `product_code`
-- btc_jpy
-- fx_btc_jpy
-- eth_btc
-- bch_btc
+`{event_name}` and `{product_code}` is defined at [client.rb](./lib/bitflyer/realtime/client.rb).
 
 #### Example
 

data/bitflyer.gemspec

@@ -17,10 +17,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'faraday', '~> 0.14.0'
-  spec.add_dependency 'faraday_middleware', '~> 0.12.0'
-  spec.add_dependency 'pubnub', '~> 4.0.22'
-  spec.add_development_dependency 'bundler', '~> 1.12'
+  spec.add_dependency 'faraday', '>= 0.14', '< 1.2'
+  spec.add_dependency 'faraday_middleware', '>= 0.12', '< 1.1'
+  spec.add_dependency 'websocket-client-simple', '~> 0.3.0'
+  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rubocop'
 end

data/lib/bitflyer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bitflyer/version'
 require 'bitflyer/http'
 require 'bitflyer/realtime'

data/lib/bitflyer/http.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bitflyer'
 require 'bitflyer/http/public'
 require 'bitflyer/http/private'
@@ -13,7 +15,7 @@ module Bitflyer
       def_delegators :@connection, :get, :post
 
       def initialize(key, secret)
-        @connection = Faraday::Connection.new(:url => 'https://api.bitflyer.jp') do |f|
+        @connection = Faraday::Connection.new(url: 'https://api.bitflyer.jp') do |f|
           f.request :json
           f.response :json
           f.use Authentication, key, secret
@@ -34,9 +36,9 @@ module Bitflyer
 
         timestamp = Time.now.to_i.to_s
         method = env[:method].to_s.upcase
-        path = env[:url].path + (env[:url].query ? '?' + env[:url].query : '')
+        path = env[:url].path + (env[:url].query ? "?#{env[:url].query}" : '')
         body = env[:body] || ''
-        signature = OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha256'), @secret, timestamp +  method + path + body)
+        signature = OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha256'), @secret, timestamp + method + path + body)
         env[:request_headers]['ACCESS-KEY'] = @key if @key
         env[:request_headers]['ACCESS-TIMESTAMP'] = timestamp
         env[:request_headers]['ACCESS-SIGN'] = signature
@@ -44,4 +46,4 @@ module Bitflyer
       end
     end
   end
-end
+end

data/lib/bitflyer/http/private.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bitflyer
   module HTTP
     module Private
@@ -40,10 +42,10 @@ module Bitflyer
 
         def withdraw(currency_code: 'JPY', bank_account_id: nil, amount: nil, code: nil)
           body = {
-              currency_code: currency_code,
-              bank_account_id: bank_account_id,
-              amount: amount,
-              code: code
+            currency_code: currency_code,
+            bank_account_id: bank_account_id,
+            amount: amount,
+            code: code
           }.delete_if { |_, v| v.nil? }
           @connection.post('/v1/me/withdraw', body).body
         end
@@ -52,102 +54,124 @@ module Bitflyer
           @connection.get('/v1/me/getwithdrawals').body
         end
 
-        def send_child_order(product_code: 'BTC_JPY', child_order_type: nil, side: nil, price: nil, size: nil, minute_to_expire: nil, time_in_force: 'GTC')
+        def send_child_order(
+          product_code: 'BTC_JPY',
+          child_order_type: nil,
+          side: nil,
+          price: nil,
+          size: nil,
+          minute_to_expire: nil,
+          time_in_force: 'GTC'
+        )
           body = {
-              product_code: product_code,
-              child_order_type: child_order_type,
-              side: side,
-              price: price,
-              size: size,
-              minute_to_expire: minute_to_expire,
-              time_in_force: time_in_force
+            product_code: product_code,
+            child_order_type: child_order_type,
+            side: side,
+            price: price,
+            size: size,
+            minute_to_expire: minute_to_expire,
+            time_in_force: time_in_force
           }.delete_if { |_, v| v.nil? }
           @connection.post('/v1/me/sendchildorder', body).body
         end
 
         def cancel_child_order(product_code: 'BTC_JPY', child_order_id: nil, child_order_acceptance_id: nil)
           body = {
-              product_code: product_code,
-              child_order_id: child_order_id,
-              child_order_acceptance_id: child_order_acceptance_id
+            product_code: product_code,
+            child_order_id: child_order_id,
+            child_order_acceptance_id: child_order_acceptance_id
           }.delete_if { |_, v| v.nil? }
           @connection.post('/v1/me/cancelchildorder', body).body
         end
 
         def send_parent_order(order_method: nil, minute_to_expire: nil, time_in_force: 'GTC', parameters: {})
           body = {
-              order_method: order_method,
-              minute_to_expire: minute_to_expire,
-              time_in_force: time_in_force,
-              parameters: parameters
+            order_method: order_method,
+            minute_to_expire: minute_to_expire,
+            time_in_force: time_in_force,
+            parameters: parameters
           }.delete_if { |_, v| v.nil? }
           @connection.post('/v1/me/sendparentorder', body).body
         end
 
         def cancel_parent_order(product_code: 'BTC_JPY', parent_order_id: nil, parent_order_acceptance_id: nil)
           body = {
-              product_code: product_code,
-              parent_order_id: parent_order_id,
-              parent_order_acceptance_id: parent_order_acceptance_id
+            product_code: product_code,
+            parent_order_id: parent_order_id,
+            parent_order_acceptance_id: parent_order_acceptance_id
           }.delete_if { |_, v| v.nil? }
           @connection.post('/v1/me/cancelparentorder', body).body
         end
 
         def cancel_all_child_orders(product_code: 'BTC_JPY')
-          @connection.post('/v1/me/cancelallchildorders', { product_code: product_code }).body
+          @connection.post('/v1/me/cancelallchildorders', product_code: product_code).body
         end
 
-        def child_orders(product_code: 'BTC_JPY', count: nil, before: nil, after: nil, child_order_state: nil, parent_order_id: nil)
+        def child_orders(
+          product_code: 'BTC_JPY',
+          count: nil,
+          before: nil,
+          after: nil,
+          child_order_state: nil,
+          parent_order_id: nil
+        )
           query = {
-              product_code: product_code,
-              count: count,
-              before: before,
-              after: after,
-              child_order_state: child_order_state,
-              parent_order_id: parent_order_id
+            product_code: product_code,
+            count: count,
+            before: before,
+            after: after,
+            child_order_state: child_order_state,
+            parent_order_id: parent_order_id
           }.delete_if { |_, v| v.nil? }
           @connection.get('/v1/me/getchildorders', query).body
         end
 
         def parent_orders(product_code: 'BTC_JPY', count: nil, before: nil, after: nil, parent_order_state: nil)
           query = {
-              product_code: product_code,
-              count: count,
-              before: before,
-              after: after,
-              parent_order_state: parent_order_state
+            product_code: product_code,
+            count: count,
+            before: before,
+            after: after,
+            parent_order_state: parent_order_state
           }.delete_if { |_, v| v.nil? }
           @connection.get('/v1/me/getparentorders', query).body
         end
 
         def parent_order(parent_order_id: nil, parent_order_acceptance_id: nil)
           query = {
-              parent_order_id: parent_order_id,
-              parent_order_acceptance_id: parent_order_acceptance_id
+            parent_order_id: parent_order_id,
+            parent_order_acceptance_id: parent_order_acceptance_id
           }.delete_if { |_, v| v.nil? }
           @connection.get('/v1/me/getparentorder', query).body
         end
 
-        def executions(product_code: 'BTC_JPY', count: nil, before: nil, after: nil, child_order_id: nil, child_order_acceptance_id: nil)
+        def executions(
+          product_code: 'BTC_JPY',
+          count: nil,
+          before: nil,
+          after: nil,
+          child_order_id: nil,
+          child_order_acceptance_id: nil
+        )
           query = {
-              product_code: product_code,
-              count: count,
-              before: before,
-              after: after,
-              child_order_id: child_order_id,
-              child_order_acceptance_id: child_order_acceptance_id,
+            product_code: product_code,
+            count: count,
+            before: before,
+            after: after,
+            child_order_id: child_order_id,
+            child_order_acceptance_id: child_order_acceptance_id
           }.delete_if { |_, v| v.nil? }
           @connection.get('/v1/me/getexecutions', query).body
         end
 
         def positions(product_code: 'FX_BTC_JPY')
-          @connection.get('/v1/me/getpositions', { product_code: product_code }).body
+          @connection.get('/v1/me/getpositions', product_code: product_code).body
         end
 
         def trading_commission(product_code: 'BTC_JPY')
-          @connection.get('v1/me/gettradingcommission', { product_code: product_code }).body
+          @connection.get('v1/me/gettradingcommission', product_code: product_code).body
         end
       end
     end
   end
-end
+end

data/lib/bitflyer/http/public.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bitflyer
   module HTTP
     module Public
@@ -14,22 +16,22 @@ module Bitflyer
           @connection.get('/v1/markets').body
         end
 
-        def board(product_code = 'BTC_JPY')
-          @connection.get('/v1/board', { product_code: product_code }).body
+        def board(product_code: 'BTC_JPY')
+          @connection.get('/v1/board', product_code: product_code).body
         end
 
-        def ticker(product_code = 'BTC_JPY')
-          @connection.get('/v1/ticker', { product_code: product_code }).body
+        def ticker(product_code: 'BTC_JPY')
+          @connection.get('/v1/ticker', product_code: product_code).body
         end
 
-        def executions(product_code = 'BTC_JPY')
-          @connection.get('/v1/executions', { product_code: product_code }).body
+        def executions(product_code: 'BTC_JPY')
+          @connection.get('/v1/executions', product_code: product_code).body
         end
 
-        def chats(from_date = (Time.now - 5 * 24 * 60 * 60))
-          @connection.get('/v1/getchats', { from_date: from_date }).body
+        def chats(from_date: (Time.now - 5 * 24 * 60 * 60))
+          @connection.get('/v1/getchats', from_date: from_date).body
         end
       end
     end
   end
-end
+end

data/lib/bitflyer/realtime.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require 'bitflyer'
 require 'bitflyer/realtime/client'
 
 module Bitflyer
   module Realtime
   end
-end
+end

data/lib/bitflyer/realtime/client.rb

@@ -1,46 +1,27 @@
-require 'pubnub'
+# frozen_string_literal: true
+
+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',
-        'lightning_board_snapshot_ETH_BTC',
-        'lightning_board_snapshot_BCH_BTC',
-        'lightning_board_BTC_JPY',
-        'lightning_board_FX_BTC_JPY',
-        'lightning_board_ETH_BTC',
-        'lightning_board_BCH_BTC',
-        'lightning_ticker_BTC_JPY',
-        'lightning_ticker_FX_BTC_JPY',
-        'lightning_ticker_ETH_BTC',
-        'lightning_ticker_BCH_BTC',
-        'lightning_executions_BTC_JPY',
-        'lightning_executions_FX_BTC_JPY',
-        'lightning_executions_ETH_BTC',
-        'lightning_executions_BCH_BTC'
-    ].freeze
+    EVENT_NAMES = %w[lightning_board_snapshot lightning_board lightning_ticker lightning_executions].freeze
+    MARKETS = %w[BTC_JPY FX_BTC_JPY ETH_BTC BCH_BTC BTCJPY_MAT3M BTCJPY_MAT1WK BTCJPY_MAT2WK].freeze
+    CHANNEL_NAMES = EVENT_NAMES.product(MARKETS).map { |e, m| "#{e}_#{m}" }
 
-    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,145 @@
+# frozen_string_literal: true
+
+require 'websocket-client-simple'
+require 'json'
+
+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&.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_interval + @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.is_a? 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 StandardError => e
+        puts e
+        puts e.backtrace.join("\n")
+      end
+
+      def setup_by_response(json:)
+        body = JSON.parse json
+        @ping_interval = body['pingInterval'].to_i || 25_000
+        @ping_timeout  = body['pingTimeout'].to_i || 60_000
+        @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,5 @@
+# frozen_string_literal: true
+
 module Bitflyer
-  VERSION = '0.2.0'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,71 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: bitflyer
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Yuji Ueki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-30 00:00:00.000000000 Z
+date: 2020-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.14'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: '0.14'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '0.12'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.12'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '1.1'
 - !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
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +120,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Bitflyer API wrapper
 email:
 - unhappychoice@gmail.com
@@ -101,6 +141,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -114,6 +157,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:
@@ -134,8 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Bitflyer API wrapper