rasti-web-broadcaster 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 37e3d3a5ed540645ccb1caa500aa4cebc9a73a8b
-  data.tar.gz: 4a4bde06cbb297ee73e8eaca452a6c9986b7f06a
+SHA256:
+  metadata.gz: bee6440950bad244f76deef7e4685575da162bc540699b69b638e78c3eefd131
+  data.tar.gz: e84320050ffb17592a5b58f2957a1f1e75727a0200916a8beadd5795a0840ebe
 SHA512:
-  metadata.gz: 25ac0b9e1fd65ddd53e5b358e70ec98afd2a8e7595e70f8ed18255e5f81272c586155a7d11af3f5e811af22f1ccd0910e8c02704bba11f8bcea4fb2c0d087dcd
-  data.tar.gz: 1f918bb57a4e5ade46fa0dd6bc37ccec7bb64f79227387df1c24f0ad32139b86ffd9182946ae47a1bdcfac824ba7a5e8b9932d3fb427be49417acac27666f458
+  metadata.gz: 4f4b557db3d69f416a6e89a6ba665a6c18c1b9ba1da9332861fac73eb14cc2acfde9336a4d4013a6a0208bb4688dbc3b9f5c59fbad0d6510dd16848df68b7d0f
+  data.tar.gz: d4e9d49f0e703e1087bb5fe3d2d9cfc4369ca8ca123af6f0e4b48e6d02d851c8782b5871bbcdd4ed5b37cb1edd3b998e19bb765a9a31d85527bbfa3194fe25b1

data/.travis.yml

@@ -1,14 +1,15 @@
 language: ruby
 
 rvm:
-  - 1.9.3
-  - 2.0
   - 2.1
   - 2.2
-  - 2.3.0
-  - 2.4.0
-  - jruby-1.7.25
-  - jruby-9.1.7.0
+  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
+  - 2.7
+  - 3.0
+  - jruby-9.2.9.0
   - ruby-head
   - jruby-head
 
@@ -18,8 +19,5 @@ matrix:
     - rvm: ruby-head
     - rvm: jruby-head
 
-before_install:
-  - gem install bundler
-
 services:
   - redis-server

data/README.md

@@ -1,10 +1,9 @@
 # Rasti::Web::Broadcaster
 
 [![Gem Version](https://badge.fury.io/rb/rasti-web-broadcaster.svg)](https://rubygems.org/gems/rasti-web-broadcaster)
-[![Build Status](https://travis-ci.org/gabynaiman/rasti-web-broadcaster.svg?branch=master)](https://travis-ci.org/gabynaiman/rasti-web-broadcaster)
+[![Build Status](https://app.travis-ci.com/gabynaiman/rasti-web-broadcaster.svg?branch=master)](https://app.travis-ci.com/gabynaiman/rasti-web-broadcaster)
 [![Coverage Status](https://coveralls.io/repos/gabynaiman/rasti-web-broadcaster/badge.svg?branch=master)](https://coveralls.io/r/gabynaiman/rasti-web-broadcaster?branch=master)
 [![Code Climate](https://codeclimate.com/github/gabynaiman/rasti-web-broadcaster.svg)](https://codeclimate.com/github/gabynaiman/rasti-web-broadcaster)
-[![Dependency Status](https://gemnasium.com/gabynaiman/rasti-web-broadcaster.svg)](https://gemnasium.com/gabynaiman/rasti-web-broadcaster)
 
 Enable server sent events with rack middleware implemented over Faye and Broadcaster (Redis Pub/Sub)
 
@@ -31,6 +30,7 @@ Or install it yourself as:
 Rasti::Web::Broadcaster.configure do |config|
   config.id = 'AppName'
   config.redis_settings = "redis://#{ENV['REDIS_HOST']}:#{ENV['REDIS_PORT']}"
+  config.keep_alive_interval = 30
   config.logger = Logger.new "/log/#{ENV['RACK_ENV']}.log"
 end
 ```

data/lib/rasti/web/broadcaster/safe_rack_lint.rb

@@ -0,0 +1,7 @@
+if defined?(Rack::Lint::HijackWrapper) && !Rack::Lint::HijackWrapper.instance_methods.include?(:to_int)
+  class Rack::Lint::HijackWrapper
+    def to_int
+      @io.to_i
+    end
+  end
+end

data/lib/rasti/web/broadcaster/timer.rb

@@ -0,0 +1,37 @@
+module Rasti
+  module Web
+    class Broadcaster
+      class Timer
+        class << self
+
+          def every(interval, &block)
+            Thread.new do
+              loop do
+                execute_using_time_slot(interval, &block)
+              end
+            end
+          end
+
+          private
+
+          def execute_using_time_slot(interval)
+            started_at = Time.now
+            yield
+
+          rescue => ex
+            Broadcaster.logger.error(self) { ex }
+
+          ensure
+            elapsed_time = Time.now - started_at
+            if elapsed_time > interval
+              Broadcaster.logger.warn(self) { "Elapsed time #{elapsed_time}s for interval of #{interval}s" }
+            else
+              sleep interval - elapsed_time
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/rasti/web/broadcaster/version.rb

@@ -1,7 +1,7 @@
 module Rasti
   module Web
     class Broadcaster
-      VERSION = '1.1.0'
+      VERSION = '2.0.0'
     end
   end
 end

data/lib/rasti/web/broadcaster.rb

@@ -3,18 +3,23 @@ require 'broadcaster'
 require 'class_config'
 
 require_relative 'broadcaster/safe_event_machine'
+require_relative 'broadcaster/safe_rack_lint'
+require_relative 'broadcaster/timer'
 require_relative 'broadcaster/version'
 
 module Rasti
   module Web
     class Broadcaster
 
+      KEEP_ALIVE_EVENT = 'keepAlive'
+
       extend ClassConfig
 
-      attr_config :id,             'rasti.web.broadcaster'
-      attr_config :redis_client,   Redic
-      attr_config :redis_settings, 'redis://localhost:6379'
-      attr_config :logger,         Logger.new(STDOUT)
+      attr_config :id,                  'rasti.web.broadcaster'
+      attr_config :redis_client,        Redic
+      attr_config :redis_settings,      'redis://localhost:6379'
+      attr_config :logger,              Logger.new(STDOUT)
+      attr_config :keep_alive_interval
 
       @mutex = Mutex.new
 
@@ -22,8 +27,8 @@ module Rasti
 
         extend Forwardable
 
-        def_delegators :broadcaster, :subscribe, 
-                                     :unsubscribe, 
+        def_delegators :broadcaster, :subscribe,
+                                     :unsubscribe,
                                      :publish
 
         private
@@ -39,20 +44,20 @@ module Rasti
       def initialize(app, headers={})
         @app = app
         @headers = headers
+        @mutex = Mutex.new
+        @subscriptions = {}
+
+        start_sending_keep_alive_messages
       end
 
       def call(env)
         if Faye::EventSource.eventsource? env
-          event_source = Faye::EventSource.new env, headers: @headers
-          channel = env['PATH_INFO'][1..-1]
+          event_source = Faye::EventSource.new env, headers: headers
 
-          subscription_id = self.class.subscribe channel do |message|
-            event_source.send message[:data], event: message[:event], 
-                                              id:    message[:id]
-          end
+          subscription_id = subscribe channel_from(env), event_source
 
           event_source.on :close do
-            self.class.unsubscribe subscription_id
+            unsubscribe subscription_id
             event_source = nil
           end
 
@@ -64,7 +69,41 @@ module Rasti
 
       private
 
-      attr_reader :app
+      attr_reader :app, :headers, :mutex, :subscriptions
+
+      def subscribe(channel, event_source)
+        subscription_id = self.class.subscribe channel do |message|
+          send_message(event_source, **message)
+        end
+
+        mutex.synchronize { subscriptions[subscription_id] = event_source }
+
+        subscription_id
+      end
+
+      def unsubscribe(subscription_id)
+        self.class.unsubscribe subscription_id
+        mutex.synchronize { subscriptions.delete subscription_id }
+      end
+
+      def send_message(event_source, data:, event: nil, id: nil)
+        event_source.send data, event: event, id: id
+      end
+
+      def start_sending_keep_alive_messages
+        if self.class.keep_alive_interval
+          Timer.every self.class.keep_alive_interval do
+            subscriptions.each do |subscription_id, event_source|
+              self.class.logger.debug(self.class) { "Sending keep alive to #{subscription_id}" }
+              send_message event_source, data: '', event: KEEP_ALIVE_EVENT
+            end
+          end
+        end
+      end
+
+      def channel_from(env)
+        env['PATH_INFO'][1..-1]
+      end
 
     end
   end

data/rasti-web-broadcaster.gemspec

@@ -18,13 +18,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'faye-websocket', '~> 0.10'
-  spec.add_runtime_dependency 'broadcaster', '~> 1.0'
+  spec.add_runtime_dependency 'faye-websocket', '~> 0.11'
+  spec.add_runtime_dependency 'broadcaster', '~> 1.0', '>= 1.0.2'
   spec.add_runtime_dependency 'class_config', '~> 0.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.12'
-  spec.add_development_dependency 'rake', '~> 11.0'
-  spec.add_development_dependency 'minitest', '~> 5.0'
+  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'minitest', '~> 5.0', '< 5.11'
   spec.add_development_dependency 'minitest-colorin', '~> 0.1'
   spec.add_development_dependency 'minitest-line', '~> 0.6'
   spec.add_development_dependency 'simplecov', '~> 0.12'
@@ -32,13 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry-nav', '~> 0.2'
   spec.add_development_dependency 'rack-test', '~> 0.6'
 
-  if RUBY_VERSION < '2'
-    spec.add_development_dependency 'term-ansicolor', '~> 1.3.0'
-    spec.add_development_dependency 'tins', '~> 1.6.0'
-    spec.add_development_dependency 'json', '~> 1.8'
-  end
-
   if RUBY_VERSION < '2.2.2'
     spec.add_development_dependency 'rack', '< 2'
   end
-end
+end

data/spec/middleware_spec.rb

@@ -46,12 +46,12 @@ describe Rasti::Web::Broadcaster do
 
     event_source = nil
     events = []
-    
-    env['async.callback'] = proc do |(status, headers, body)|
+
+    env['async.callback'] = proc do |(_status, _headers, body)|
       event_source = body.instance_variable_get(:@socket_object)
       body.each { |e| events << e }
     end
-    
+
     Rasti::Web::Broadcaster.publish 'channel_1', data: 'message 0'
 
     app.call env
@@ -60,14 +60,15 @@ describe Rasti::Web::Broadcaster do
     Rasti::Web::Broadcaster.publish 'channel_2', data: 'message 2'
     Rasti::Web::Broadcaster.publish 'channel_1', data: 'message 3'
 
-    wait_for { events.count == 3 }
+    wait_for { events.count == 4 }
 
     event_source.close
 
     events.must_equal [
       event_headers,
-      event_for(data: 'message 1', event: 'event_1', id: 1), 
-      event_for(data: 'message 3')
+      event_for(data: 'message 1', event: 'event_1', id: 1),
+      event_for(data: 'message 3'),
+      event_for(event: Rasti::Web::Broadcaster::KEEP_ALIVE_EVENT)
     ]
   end
 

data/spec/minitest_helper.rb

@@ -5,4 +5,7 @@ require 'pry-nav'
 require 'rasti-web-broadcaster'
 require 'rack/test'
 
-Rasti::Web::Broadcaster.logger.level = Logger::ERROR
+Rasti::Web::Broadcaster.configure do |config|
+  config.logger = Logger.new '/dev/null'
+  config.keep_alive_interval = 0.1
+end

data/spec/timer_spec.rb

@@ -0,0 +1,48 @@
+require 'minitest_helper'
+
+describe Rasti::Web::Broadcaster::Timer do
+
+  let(:timer) { Rasti::Web::Broadcaster::Timer }
+
+  it 'Tick' do
+    count = 0
+
+    thread = timer.every(0.02) do
+      count += 1
+    end
+
+    sleep 0.07
+    thread.exit
+
+    count.must_equal 4
+  end
+
+  it 'Interval exceded' do
+    count = 0
+
+    thread = timer.every(0.02) do
+      sleep 0.04 if count == 1
+      count += 1
+    end
+
+    sleep 0.07
+    thread.exit
+
+    count.must_equal 3
+  end
+
+  it 'Error safe' do
+    count = 0
+
+    thread = timer.every(0.02) do
+      count += 1
+      raise 'Unexpected error' if count == 2
+    end
+
+    sleep 0.05
+    thread.exit
+
+    count.must_equal 3
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasti-web-broadcaster
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-11 00:00:00.000000000 Z
+date: 2022-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: broadcaster
   requirement: !ruby/object:Gem::Requirement
@@ -31,6 +31,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +41,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: class_config
   requirement: !ruby/object:Gem::Requirement
@@ -52,34 +58,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -87,6 +79,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -94,6 +89,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.11'
 - !ruby/object:Gem::Dependency
   name: minitest-colorin
   requirement: !ruby/object:Gem::Requirement
@@ -198,11 +196,14 @@ files:
 - lib/rasti-web-broadcaster.rb
 - lib/rasti/web/broadcaster.rb
 - lib/rasti/web/broadcaster/safe_event_machine.rb
+- lib/rasti/web/broadcaster/safe_rack_lint.rb
+- lib/rasti/web/broadcaster/timer.rb
 - lib/rasti/web/broadcaster/version.rb
 - rasti-web-broadcaster.gemspec
 - spec/coverage_helper.rb
 - spec/middleware_spec.rb
 - spec/minitest_helper.rb
+- spec/timer_spec.rb
 homepage: https://github.com/gabynaiman/rasti-web-broadcaster
 licenses:
 - MIT
@@ -222,8 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Rack middleware for server sent events
@@ -231,3 +231,4 @@ test_files:
 - spec/coverage_helper.rb
 - spec/middleware_spec.rb
 - spec/minitest_helper.rb
+- spec/timer_spec.rb