cotcube-dataproxy 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9edcf5e59cffe3a7dbb7a03c8896da6cd98ecb288dfc648297e06c64bd0b3314
-  data.tar.gz: 3701e4dc24d822c7349015ff4d3e5bcd28dea57d126905016706c276ee088136
+  metadata.gz: 82334ed8c2a2bdb18dd9a0338d24867bfb6477b648d10fd51439fcfa7503c298
+  data.tar.gz: 8104e6d40180b2738507abadd1422288cfd2e60220e7d10c5dbf78ede6f0387a
 SHA512:
-  metadata.gz: cf474143f34f1d81f148f1a72986d1c575f3407a19e4494c9fa6e0e08be18b90bf5057bf4f248667a6bcbd9812e32d9cb6e75a75343e05c765dd7ab9cc5c6ddf
-  data.tar.gz: 14599b72e780bcf9a942f70448ed1fdaf5ee9aad649b30c3701f056802fb3ea44275d6c47dee5e05da94eb8ed23620d393e14ec96c8ed347b33ad54c2f8db640
+  metadata.gz: b8b14427fb654780a1653348d31e9ecc3e65fe5f9d04b5508f625a77a42c7c633165a059705175b4199633887e3bb3cd8f38c2f090c698399117e32606d1692b
+  data.tar.gz: 0d77a939e81396c754c39a5e3d74d9bcad075c0875b20ca006f0a50388efe1e850a157830d82d9161d17270134493d34ac2f3e1250ac9a5ba0b7838fdcad5693

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.1.2 (November 28, 2021)
+  - subscribers/historical: returning improved values hash
+  - added validator for contract to sub historical
+  - client_response: improvied log output
+  - 3rd-clients: removed auto-delete (due to working GC)
+
 ## 0.1.1 (November 13, 2021)
   - added handy test_script in bin/test_client.rb
   - added httparty to Gem requirements

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/cotcube-dataproxy/3rd_clients.rb

@@ -47,8 +47,8 @@ module Cotcube
         obj[:commands]      = obj[:connection].create_channel
         obj[:channel]       = obj[:connection].create_channel
         obj[:request_queue] = obj[:commands].queue('', exclusive: true, auto_delete: true)
-        obj[:request_exch]  = obj[:commands].direct('dataproxy_commands', exclusive: true, auto_delete: true)
-        obj[:replies_exch]  = obj[:commands].direct('dataproxy_replies', auto_delete: true)
+        obj[:request_exch]  = obj[:commands].direct('dataproxy_commands')
+        obj[:replies_exch]  = obj[:commands].direct('dataproxy_replies')
         %w[ dataproxy_commands  ].each do |key|
           obj[:request_queue].bind(obj[:request_exch], routing_key: key )
         end

data/lib/cotcube-dataproxy/client_response.rb

@@ -27,11 +27,11 @@ module Cotcube
         response = { error: 1, msg: "Processing failed for '#{msg.inspect}' after '#{request}'." }
       end
       if response[:error] == 1
-        log "CLIENT #{id} FAILIURE:      #{response.inspect}.".colorize(:light_red)
+        log "CLIENT #{__id__} FAILIURE:      #{response.inspect}.".colorize(:light_red)
       elsif response[:result].is_a?(Array)
-        log "CLIENT #{id} SUCCESS:       sent #{response[:result].size} datasets."
+        log "CLIENT #{__id__} SUCCESS:       sent #{response[:result].size} datasets."
       else
-        log "CLIENT #{id} SUCCESS:       #{response.to_s.scan(/.{1,120}/).join(' '*30 + "\n")}"
+        log "CLIENT #{__id__} SUCCESS:       #{response.to_s[..220].scan(/.{1,120}/).join(' '*30 + "\n")}"
       end
       mq[exchange].publish(
         response.to_json,

data/lib/cotcube-dataproxy/commserver.rb

@@ -75,6 +75,10 @@ module Cotcube
         #     the IB message 'HistoricalData' in message subscribers section
         #
         when Cotcube::Helpers.sub(minimum: 3) {'historical'}
+          unless request[:contract].is_a? String and request[:contract].size == 5
+            client_fail(request) { "IB needs complete contract information to request data, e.g. ESZ21 instead of ES, got '#{request[:contract]}' in '#{request}'." }
+            next
+          end
           con_id = request[:con_id] || Cotcube::Helpers.get_ib_contract(request[:contract])[:con_id] rescue nil
           if con_id.nil? or request[:contract].nil? 
              client_fail(request) { "Cannot get :con_id for contract:'#{request[:contract]}' in '#{request}'." } 
@@ -85,6 +89,8 @@ module Cotcube
           ib_contract = IB::Contract.new(con_id: con_id, exchange: sym[:exchange])
           req = {
             request_id:    request[:__id__].to_i(16),
+            symbol:        sym[:symbol],
+            sym:           sym,
             contract:      ib_contract,
             end_date_time: before,
             what_to_show:  (request[:based_on]                || :trades),

data/lib/cotcube-dataproxy/subscribers.rb

@@ -39,7 +39,15 @@ module Cotcube
           case msg
 
           when IB::Messages::Incoming::HistoricalData
-            client_success(requests[__id__]) { msg.results }
+            client_success(requests[__id__]) {
+              {
+                symbol:   requests[__id__][:contract][..1],
+                contract: requests[__id__][:contract],
+                base: msg.results.map{|z|
+                  z.attributes.tap{|z1| z1.delete(:created_at) }
+                }
+              }
+            }
             req_mon.synchronize { requests.delete(__id__) }
 
           when IB::Messages::Incoming::Alert # Alert

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cotcube-dataproxy
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Benjamin L. Tischendorf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-13 00:00:00.000000000 Z
+date: 2021-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport