zeromem-ws 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7b0d5d96cc5bb5be04147542ba2edb82471ed8d5
-  data.tar.gz: 258079e59fc407083915527ba6d481a497781ee3
+SHA256:
+  metadata.gz: 8897043c0dd25c5c914da20de4635b21a4d83aedba92ad6fe266077de16070cd
+  data.tar.gz: ff4c231a094fdbdf15539212b54eca394d87fdbff5b02c9e47c35ac344793bcb
 SHA512:
-  metadata.gz: 53f80343063fabc79faf8ba78147027493c614667446e8eae4a907137157f811c53dd05aecaf1b5d5b1e6d1210cde7aaa9e16995450212a7ccffb58220362763
-  data.tar.gz: 398efc088dedc70fbe6b6681aa1a8910236d5e685080fc9298a1709975d547197661a7d130b0a401fbe91c256df01e62ceb4fe313171e8375f61f7a5d83c53cd
+  metadata.gz: d7eb63a9c62dff9b5a61c9d074824ff2874b831117b0cbaf73caf6600566e09c7d9dbd6f652a67c9980eab344b0510d9f71d80c07624bb5928a04aea48ad8ff3
+  data.tar.gz: 25c27d8699df8373c3a72df949016de6ee857b73e00bb9281eec31259b0936464d29d0a1f3e07ee5d3aba674a8f90a8dd401b0dc963ac21029e5b32a2aacafe9

data/.gitignore

@@ -1,11 +1,11 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-
-# rspec failure tracking
-.rspec_status
+/.bundle/
+/.yardoc
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+
+# rspec failure tracking
+.rspec_status

data/.rspec

@@ -1,3 +1,3 @@
---format documentation
---color
---require spec_helper
+--format documentation
+--color
+--require spec_helper

data/.travis.yml

@@ -1,5 +1,5 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.4.1
-before_install: gem install bundler -v 1.16.0
+sudo: false
+language: ruby
+rvm:
+  - 2.4.1
+before_install: gem install bundler -v 1.16.0

data/Gemfile

@@ -1,8 +1,8 @@
-source "https://rubygems.org"
-
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-
-# Specify your gem's dependencies in zeromem-ws.gemspec
-gemspec
-
+source "https://rubygems.org"
+
+git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+
+# Specify your gem's dependencies in zeromem-ws.gemspec
+gemspec
+
 gem "eventmachine", ">= 1.2.5"

data/Gemfile.lock

@@ -1,53 +1,54 @@
-PATH
-  remote: .
-  specs:
-    zeromem-ws (0.1.1)
-      em-websocket (~> 0.5.1)
-      em-websocket-client (~> 0.1.2)
-      rjr (>= 0.19.3)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.3)
-    em-websocket (0.5.1)
-      eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0.6.0)
-    em-websocket-client (0.1.2)
-      eventmachine
-      websocket
-    eventmachine (1.2.5)
-    http_parser.rb (0.6.0)
-    json (2.1.0)
-    rake (10.5.0)
-    rjr (0.19.3)
-      eventmachine
-      json (>= 1.7.6)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.0)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.0)
-    websocket (1.2.5)
-
-PLATFORMS
-  ruby
-  x86-mingw32
-
-DEPENDENCIES
-  bundler (~> 1.16)
-  eventmachine (>= 1.2.5)
-  rake (~> 10.0)
-  rspec (~> 3.0)
-  zeromem-ws!
-
-BUNDLED WITH
-   1.16.0
+PATH
+  remote: .
+  specs:
+    zeromem-ws (0.1.2)
+      em-websocket (~> 0.5.1)
+      em-websocket-client (~> 0.1.2)
+      rjr (>= 0.19.3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.3)
+    em-websocket (0.5.2)
+      eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0.6.0)
+    em-websocket-client (0.1.2)
+      eventmachine
+      websocket
+    eventmachine (1.2.5)
+    eventmachine (1.2.5-x86-mingw32)
+    http_parser.rb (0.6.0)
+    json (2.5.1)
+    rake (13.0.1)
+    rjr (0.19.3)
+      eventmachine
+      json (>= 1.7.6)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
+    websocket (1.2.9)
+
+PLATFORMS
+  ruby
+  x86-mingw32
+
+DEPENDENCIES
+  bundler (>= 2.2.10)
+  eventmachine (>= 1.2.5)
+  rake (~> 13.0)
+  rspec (~> 3.0)
+  zeromem-ws!
+
+BUNDLED WITH
+   2.2.19

data/LICENSE.txt

@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2017 zeromem
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2017 zeromem
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -1,49 +1,49 @@
-# Zeromem::Ws
-
-This is implementation for movitto/rjr websocket Node for JSON-RPC to eliminate  
-performance degradation under heavy load (1000s queries per minute).
-
-Current implementation has memory leak which cause CPU overhead accumulation.
-
-
-## Installation
-
-
-
-```ruby
-gem 'zeromem-ws'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install zeromem-ws
-
-## Usage
-```ruby
-require 'zeromem/ws'
-
-server = Zeromem::Ws::WsHeavy.new :host => 'localhost', :port => 9789, :node_id => "server"
-server.dispatcher.handle('method') { |i|
-  puts "server: #{i}"
-  "#{i}".upcase
-}
-server.listen
-
-client = Zeromem::Ws::WsHeavy.new :node_id => "client", :timeout => 8000
-
-0.upto(50000) { |i| 
-  puts "#{i}" 
-  puts client.invoke "ws://localhost:9789", "method", "Hello World" 
-}
-```
-
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/zeromem88/ruby-zeromem-ws.
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+# Zeromem::Ws
+
+This is implementation for movitto/rjr websocket Node for JSON-RPC to eliminate  
+performance degradation under heavy load (1000s queries per minute).
+
+Current implementation has memory leak which cause CPU overhead accumulation.
+
+
+## Installation
+
+
+
+```ruby
+gem 'zeromem-ws'
+```
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install zeromem-ws
+
+## Usage
+```ruby
+require 'zeromem/ws'
+
+server = Zeromem::Ws::WsHeavy.new :host => 'localhost', :port => 9789, :node_id => "server"
+server.dispatcher.handle('method') { |i|
+  puts "server: #{i}"
+  "#{i}".upcase
+}
+server.listen
+
+client = Zeromem::Ws::WsHeavy.new :node_id => "client", :timeout => 8000
+
+0.upto(50000) { |i| 
+  puts "#{i}" 
+  puts client.invoke "ws://localhost:9789", "method", "Hello World" 
+}
+```
+
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/zeromem88/ruby-zeromem-ws.
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/Rakefile

@@ -1,6 +1,6 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/bin/console

@@ -1,14 +1,14 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "zeromem/ws"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "zeromem/ws"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +1,8 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/lib/zeromem/ws.rb

@@ -1,85 +1,85 @@
-require "zeromem/ws/version"
-require 'rjr/core_ext'
-require 'rjr/nodes/ws'
-
-module Zeromem
-  module Ws
-    class WsHeavy < RJR::Nodes::WS
-      # WS initializer
-      # @param [Hash] args the options to create the web socket node with
-      # @option args [String] :host the hostname/ip which to listen on
-      # @option args [Integer] :port the port which to listen on
-      def initialize(args = {})
-        super(args)
-      end
-
-      # Instructs node to send rpc request, and wait for / return response
-      #
-      # Implementation of Zeromem::Ws::WsHeavy#invoke
-      # This is custom implementation of RJR::Node#invoke
-      # to make things work perfectly under heavy load (thousands of ws queries per min)
-      #
-      # Do not invoke directly from em event loop or callback as will block the message
-      # subscription used to receive responses
-      #
-      # @param [String] uri location of node to send request to, should be
-      #   in format of ws://hostname:port
-      # @param [String] rpc_method json-rpc method to invoke on destination
-      # @param [Array] args array of arguments to convert to json and invoke remote method wtih
-      def invoke(uri, rpc_method, *args)
-        message = RJR::Messages::Request.new :method => rpc_method,
-        :args   => args,
-        :headers => @message_headers
-
-        @@em.schedule {
-          init_client(uri) do |c|
-            c.stream { |msg| handle_message(msg.data, c) }
-
-            c.send_msg message.to_s
-          end
-        }
-
-        # TODO optional timeout for response ?
-        # this cause resource leak
-        #result = wait_for_result(message)
-
-        result = wait_for_result_custom(message)
-
-        if result.size > 2
-          fail result[2]
-        end
-        return result[1]
-      end
-
-      private
-      def wait_for_result_custom(message)
-        res = nil
-        message_id = message.msg_id
-        @pending[message_id] = Time.now
-        while res.nil?
-          @response_lock.synchronize{
-            # Prune messages that timed out
-            if @timeout
-              now = Time.now
-              @pending.delete_if { |_, start_time| (now - start_time) > @timeout }
-            end
-            pending_ids = @pending.keys
-            fail 'Timed out' unless pending_ids.include? message_id
-
-            # Prune invalid responses
-            @responses.keep_if { |response| @pending.has_key? response.first }
-            res = @responses.find { |response| message.msg_id == response.first }
-            if !res.nil?
-              @responses.delete(res)
-              @pending.delete(message_id)
-            else
-              @response_cv.wait @response_lock, @wait_interval
-            end
-          }
-        end
-        return res
-      end
-
-    end
-  end
-end
+require "zeromem/ws/version"
+require 'rjr/core_ext'
+require 'rjr/nodes/ws'
+
+module Zeromem
+  module Ws
+    class WsHeavy < RJR::Nodes::WS
+      # WS initializer
+      # @param [Hash] args the options to create the web socket node with
+      # @option args [String] :host the hostname/ip which to listen on
+      # @option args [Integer] :port the port which to listen on
+      def initialize(args = {})
+        super(args)
+      end
+
+      # Instructs node to send rpc request, and wait for / return response
+      #
+      # Implementation of Zeromem::Ws::WsHeavy#invoke
+      # This is custom implementation of RJR::Node#invoke
+      # to make things work perfectly under heavy load (thousands of ws queries per min)
+      #
+      # Do not invoke directly from em event loop or callback as will block the message
+      # subscription used to receive responses
+      #
+      # @param [String] uri location of node to send request to, should be
+      #   in format of ws://hostname:port
+      # @param [String] rpc_method json-rpc method to invoke on destination
+      # @param [Array] args array of arguments to convert to json and invoke remote method wtih
+      def invoke(uri, rpc_method, *args)
+        message = RJR::Messages::Request.new :method => rpc_method,
+        :args   => args,
+        :headers => @message_headers
+
+        @@em.schedule {
+          init_client(uri) do |c|
+            c.stream { |msg| handle_message(msg.data, c) }
+
+            c.send_msg message.to_s
+          end
+        }
+
+        # TODO optional timeout for response ?
+        # this cause resource leak
+        #result = wait_for_result(message)
+
+        result = wait_for_result_custom(message)
+
+        if result.size > 2
+          fail result[2]
+        end
+        return result[1]
+      end
+
+      private
+      def wait_for_result_custom(message)
+        res = nil
+        message_id = message.msg_id
+        @pending[message_id] = Time.now
+        while res.nil?
+          @response_lock.synchronize{
+            # Prune messages that timed out
+            if @timeout
+              now = Time.now
+              @pending.delete_if { |_, start_time| (now - start_time) > @timeout }
+            end
+            pending_ids = @pending.keys
+            fail 'Timed out' unless pending_ids.include? message_id
+
+            # Prune invalid responses
+            @responses.keep_if { |response| @pending.has_key? response.first }
+            res = @responses.find { |response| message.msg_id == response.first }
+            if !res.nil?
+              @responses.delete(res)
+              @pending.delete(message_id)
+            else
+              @response_cv.wait @response_lock, @wait_interval
+            end
+          }
+        end
+        return res
+      end
+
+    end
+  end
+end

data/lib/zeromem/ws/version.rb

@@ -1,5 +1,5 @@
-module Zeromem
-  module Ws
-    VERSION = "0.1.2"
-  end
-end
+module Zeromem
+  module Ws
+    VERSION = "0.1.3"
+  end
+end

data/zeromem-ws.gemspec

@@ -1,30 +1,30 @@
-
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "zeromem/ws/version"
-
-Gem::Specification.new do |spec|
-  spec.name          = "zeromem-ws"
-  spec.version       = Zeromem::Ws::VERSION
-  spec.authors       = ["zeromem88"]
-  spec.email         = ["zeromem2@gmail.com"]
-
-  spec.summary       = %q{Extended websocket client based on Movitto/rjr package}
-  spec.description   = %q{Eliminates performance degradation of Movitto/rjr websocket json-rpc client under heavy load}
-  spec.homepage      = "https://github.com/zeromem88/ruby-zeromem-ws"
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
-  end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_dependency "em-websocket", "~> 0.5.1"
-  spec.add_dependency "em-websocket-client", "~> 0.1.2"
-  spec.add_dependency "rjr", ">= 0.19.3"
-end
+
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "zeromem/ws/version"
+
+Gem::Specification.new do |spec|
+  spec.name          = "zeromem-ws"
+  spec.version       = Zeromem::Ws::VERSION
+  spec.authors       = ["zeromem88"]
+  spec.email         = ["zeromem2@gmail.com"]
+
+  spec.summary       = %q{Extended websocket client based on Movitto/rjr package}
+  spec.description   = %q{Eliminates performance degradation of Movitto/rjr websocket json-rpc client under heavy load}
+  spec.homepage      = "https://github.com/zeromem88/ruby-zeromem-ws"
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", ">= 2.2.10"
+  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_dependency "em-websocket", "~> 0.5.1"
+  spec.add_dependency "em-websocket-client", "~> 0.1.2"
+  spec.add_dependency "rjr", ">= 0.19.3"
+end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: zeromem-ws
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - zeromem88
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-26 00:00:00.000000000 Z
+date: 2021-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.2.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -135,8 +135,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.1.2
 signing_key: 
 specification_version: 4
 summary: Extended websocket client based on Movitto/rjr package