anycable-rack-server 0.0.1 → 0.3.0

data/lib/anycable/{rack-server → rack}/socket.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
-require 'anycable/rack-server/logging'
+require "anycable/rack/logging"
 
 module AnyCable
-  module RackServer
+  module Rack
+    # Socket wrapper
     class Socket
       include Logging
       attr_reader :version, :socket
@@ -14,11 +15,11 @@ module AnyCable
         @socket = socket
         @version = version
 
-        @_open_handlers    = []
+        @_open_handlers = []
         @_message_handlers = []
-        @_close_handlers   = []
-        @_error_handlers   = []
-        @_active           = true
+        @_close_handlers = []
+        @_error_handlers = []
+        @_active = true
       end
 
       def transmit(data, type: :text)
@@ -28,13 +29,13 @@ module AnyCable
           type: type
         )
         socket.write(frame.to_s)
-      rescue IOError, Errno::EPIPE, Errno::ETIMEDOUT => e
+      rescue Exception => e # rubocop:disable Lint/RescueException
         log(:error, "Socket send failed: #{e}")
         close
       end
 
       def request
-        @_request ||= ::Rack::Request.new(@env)
+        @request ||= ::Rack::Request.new(@env)
       end
 
       def onopen(&block)
@@ -53,22 +54,19 @@ module AnyCable
         @_error_handlers << block
       end
 
-      # rubocop: disable Metrics/MethodLength
       def listen
         keepalive
         Thread.new do
-          Thread.current.abort_on_exception = true
+          Thread.current.report_on_exception = true
           begin
             @_open_handlers.each(&:call)
             each_frame do |data|
               @_message_handlers.each do |handler|
-                begin
-                  handler.call(data)
-                rescue => e # rubocop: disable Style/RescueStandardError
-                  log(:error, "Socket receive failed: #{e}")
-                  @_error_handlers.each { |eh| eh.call(e, data) }
-                  close
-                end
+                handler.call(data)
+              rescue => e # rubocop: disable Style/RescueStandardError
+                log(:error, "Socket receive failed: #{e}")
+                @_error_handlers.each { |eh| eh.call(e, data) }
+                close
               end
             end
           ensure
@@ -76,7 +74,6 @@ module AnyCable
           end
         end
       end
-      # rubocop: enable Metrics/MethodLength
 
       def close
         return unless @_active
@@ -105,7 +102,7 @@ module AnyCable
         frame = WebSocket::Frame::Outgoing::Server.new(version: version, type: :close, code: 1000)
         socket.write(frame.to_s) if frame.supported?
         socket.close
-      rescue IOError, Errno::EPIPE, Errno::ETIMEDOUT # rubocop:disable Lint/HandleExceptions
+      rescue Exception # rubocop:disable Lint/RescueException
         # already closed
       end
 
@@ -114,8 +111,7 @@ module AnyCable
           Thread.current.abort_on_exception = true
           loop do
             sleep 5
-            time = Time.now.to_i
-            transmit({ message: time, type: :ping }.to_json)
+            transmit nil, type: :ping
           end
         end
 
@@ -124,24 +120,21 @@ module AnyCable
         end
       end
 
-      # rubocop:disable Metrics/AbcSize
-      # rubocop:disable Metrics/CyclomaticComplexity
-      # rubocop:disable Metrics/PerceivedComplexity
-      # rubocop:disable Metrics/MethodLength
       def each_frame
         framebuffer = WebSocket::Frame::Incoming::Server.new(version: version)
         while IO.select([socket])
           if socket.respond_to?(:recvfrom)
             data, _addrinfo = socket.recvfrom(2000)
           else
-            data, _addrinfo = socket.readpartial(2000), socket.peeraddr
+            data = socket.readpartial(2000)
+            _addrinfo = socket.peeraddr
           end
 
           break if data.empty?
 
           framebuffer << data
 
-          while frame = framebuffer.next
+          while frame = framebuffer.next # rubocop:disable Lint/AssignmentInCondition
             case frame.type
             when :close
               return
@@ -150,7 +143,7 @@ module AnyCable
             end
           end
         end
-      rescue Errno::EHOSTUNREACH, Errno::ETIMEDOUT, Errno::ECONNRESET, IOError, Errno::EBADF => e
+      rescue Exception => e # rubocop:disable Lint/RescueException
         log(:error, "Socket frame error: #{e}")
         nil # client disconnected or timed out
       end

data/lib/anycable/{rack-server → rack}/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module AnyCable
-  module RackServer
-    VERSION = '0.0.1'
+  module Rack
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,99 +1,162 @@
 --- !ruby/object:Gem::Specification
 name: anycable-rack-server
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Yulia Oletskaya
-autorequire: 
+- Vladimir Dementyev
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-01-06 00:00:00.000000000 Z
+date: 2021-05-12 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: anyway_config
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: anycable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 1.0.99
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 1.0.99
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: websocket
+  name: connection_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: redis
+  name: websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: anyt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.11'
+        version: '5.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.11'
+        version: '5.10'
+- !ruby/object:Gem::Dependency
+  name: puma
+  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
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '4'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.80'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.80'
 description: AnyCable-compatible Ruby Rack middleware
 email: yulia.oletskaya@gmail.com
 executables: []
@@ -103,24 +166,28 @@ files:
 - LICENSE
 - README.md
 - lib/anycable-rack-server.rb
-- lib/anycable/rack-server.rb
-- lib/anycable/rack-server/broadcast_subscribers/redis_subscriber.rb
-- lib/anycable/rack-server/coders/json.rb
-- lib/anycable/rack-server/connection.rb
-- lib/anycable/rack-server/errors.rb
-- lib/anycable/rack-server/hub.rb
-- lib/anycable/rack-server/logging.rb
-- lib/anycable/rack-server/middleware.rb
-- lib/anycable/rack-server/pinger.rb
-- lib/anycable/rack-server/rpc/client.rb
-- lib/anycable/rack-server/rpc/rpc.proto
-- lib/anycable/rack-server/socket.rb
-- lib/anycable/rack-server/version.rb
-homepage: 
+- lib/anycable/rack/broadcast_subscribers/base_subscriber.rb
+- lib/anycable/rack/broadcast_subscribers/http_subscriber.rb
+- lib/anycable/rack/broadcast_subscribers/redis_subscriber.rb
+- lib/anycable/rack/coders/json.rb
+- lib/anycable/rack/config.rb
+- lib/anycable/rack/connection.rb
+- lib/anycable/rack/errors.rb
+- lib/anycable/rack/hub.rb
+- lib/anycable/rack/logging.rb
+- lib/anycable/rack/middleware.rb
+- lib/anycable/rack/pinger.rb
+- lib/anycable/rack/railtie.rb
+- lib/anycable/rack/rpc/client.rb
+- lib/anycable/rack/rpc/rpc.proto
+- lib/anycable/rack/server.rb
+- lib/anycable/rack/socket.rb
+- lib/anycable/rack/version.rb
+homepage:
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -135,9 +202,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
-summary: Anycable Rack Server
+summary: AnyCable Rack Server
 test_files: []

data/lib/anycable/rack-server.rb

@@ -1,107 +0,0 @@
-# frozen_string_literal: true
-
-require 'set'
-require 'json'
-require 'anycable'
-require 'websocket'
-require 'securerandom'
-require 'anycable/rack-server/hub'
-require 'anycable/rack-server/pinger'
-require 'anycable/rack-server/errors'
-require 'anycable/rack-server/middleware'
-require 'anycable/rack-server/broadcast_subscribers/redis_subscriber'
-require 'anycable/rack-server/coders/json'
-
-module AnyCable
-  module RackServer
-    DEFAULT_OPTIONS = {
-      headers:  ['cookie', 'x-api-token']
-    }.freeze
-
-    class << self
-      attr_reader :broadcast_subscriber,
-                  :coder,
-                  :hub,
-                  :middleware,
-                  :pinger,
-                  :server_id
-
-      def start(options = {})
-        options  = DEFAULT_OPTIONS.merge(options)
-        @hub     = Hub.new
-        @pinger  = Pinger.new
-        @coder   = Coders::JSON
-
-        rpc_host = unpack_host(AnyCable.config.rpc_host)
-        headers  = parse_env_headers || options[:headers]
-
-        @server_id = "anycable-rack-server-#{SecureRandom.hex}"
-        @middleware = Middleware.new(
-          nil,
-          pinger:    pinger,
-          hub:       hub,
-          coder:     coder,
-          rpc_host:  rpc_host,
-          headers:   headers,
-          server_id: server_id
-        )
-
-        broadcast_subscribe
-
-        @_started = true
-      end
-
-      def started?
-        @_started == true
-      end
-
-      def stop
-        return unless started?
-
-        @_started = false
-        broadcast_subscriber.unsubscribe(@_redis_channel)
-        pinger.stop
-
-        hub.sockets.each do |socket|
-          hub.remove_socket(socket)
-          socket.close
-        end
-      end
-
-      private
-
-      def broadcast_subscribe
-        @_redis_params  = AnyCable.config.to_redis_params
-        @_redis_channel = AnyCable.config.redis_channel
-
-        @broadcast_subscriber = BroadcastSubscribers::RedisSubscriber.new(
-          hub:     @hub,
-          coder:   @coder,
-          options: @_redis_params
-        )
-
-        @broadcast_subscriber.subscribe(@_redis_channel)
-      end
-
-      def parse_env_headers
-        headers = ENV['ANYCABLE_HEADERS'].to_s.split(',')
-        return nil if headers.empty?
-        headers
-      end
-
-      def unpack_host(str)
-        str.gsub('[::]', '0.0.0.0')
-      end
-    end
-  end
-
-  class Rack
-    def initialize(_app = nil, options = {})
-      AnyCable::RackServer.start(options)
-    end
-
-    def call(env)
-      AnyCable::RackServer.middleware.call(env)
-    end
-  end
-end