anycable-rack-server 0.1.0 → 0.4.0

data/lib/anycable/rack/socket.rb

@@ -4,6 +4,17 @@ require "anycable/rack/logging"
 
 module AnyCable
   module Rack
+    # Wrapper for outgoing data used to correctly set the WS frame type
+    class BinaryFrame
+      def initialize(data)
+        @data = data
+      end
+
+      def to_s
+        @data.to_s
+      end
+    end
+
     # Socket wrapper
     class Socket
       include Logging
@@ -15,21 +26,23 @@ 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)
+      def transmit(data, type: nil)
+        # p "DATA: #{data.class} — #{data.to_s}"
+        type ||= data.is_a?(BinaryFrame) ? :binary : :text
         frame = WebSocket::Frame::Outgoing::Server.new(
           version: version,
           data: data,
           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
@@ -62,13 +75,11 @@ module AnyCable
             @_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
@@ -104,7 +115,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
+      rescue Exception # rubocop:disable Lint/RescueException
         # already closed
       end
 
@@ -113,8 +124,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
 
@@ -137,7 +147,7 @@ module AnyCable
 
           framebuffer << data
 
-          while frame = framebuffer.next
+          while frame = framebuffer.next # rubocop:disable Lint/AssignmentInCondition
             case frame.type
             when :close
               return
@@ -146,8 +156,8 @@ module AnyCable
             end
           end
         end
-      rescue Errno::EHOSTUNREACH, Errno::ETIMEDOUT, Errno::ECONNRESET, IOError, Errno::EBADF => e
-        log(:error, "Socket frame error: #{e}")
+      rescue Exception => e # rubocop:disable Lint/RescueException
+        log(:error, "Socket frame error: #{e}\n #{e.backtrace.take(4).join("\n")}")
         nil # client disconnected or timed out
       end
     end

data/lib/anycable/rack/version.rb

@@ -2,6 +2,6 @@
 
 module AnyCable
   module Rack
-    VERSION = "0.1.0"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,71 +1,92 @@
 --- !ruby/object:Gem::Specification
 name: anycable-rack-server
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Yulia Oletskaya
-autorequire: 
+- Vladimir Dementyev
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-01-14 00:00:00.000000000 Z
+date: 2021-05-14 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: '0.6'
+        version: 1.0.99
+    - - "<"
+      - !ruby/object:Gem::Version
+        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.4
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -96,32 +117,46 @@ dependencies:
         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.60.0
+        version: '0.80'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.60.0
+        version: '0.80'
 description: AnyCable-compatible Ruby Rack middleware
 email: yulia.oletskaya@gmail.com
 executables: []
@@ -131,8 +166,12 @@ files:
 - LICENSE
 - README.md
 - lib/anycable-rack-server.rb
+- 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/coders/msgpack.rb
+- lib/anycable/rack/config.rb
 - lib/anycable/rack/connection.rb
 - lib/anycable/rack/errors.rb
 - lib/anycable/rack/hub.rb
@@ -142,15 +181,14 @@ files:
 - lib/anycable/rack/railtie.rb
 - lib/anycable/rack/rpc/client.rb
 - lib/anycable/rack/rpc/rpc.proto
-- lib/anycable/rack/rpc_runner.rb
 - lib/anycable/rack/server.rb
 - lib/anycable/rack/socket.rb
 - lib/anycable/rack/version.rb
-homepage: 
+homepage:
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -165,9 +203,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/rpc_runner.rb

@@ -1,60 +0,0 @@
-# frozen_string_literal: true
-
-require "anycable"
-require "anycable/rack/logging"
-
-$stdout.sync = true
-
-module AnyCable
-  module Rack
-    # Runs AnyCable CLI in a separate process
-    module RPCRunner
-      class << self
-        include Logging
-
-        attr_accessor :running, :pid
-
-        def run(root_dir:, command_args: [], rpc_host: "[::]:50051", env: {})
-          return if @running
-
-          command_args << "--rpc-host=\"#{rpc_host}\""
-
-          command = "bundle exec anycable #{command_args.join(' ')}"
-
-          log(:info, "Running AnyCable (from #{root_dir}): #{command}")
-
-          out = AnyCable.config.debug? ? STDOUT : IO::NULL
-
-          @pid = Dir.chdir(root_dir) do
-            Process.spawn(
-              env,
-              command,
-              out: out,
-              err: out
-            )
-          end
-
-          log(:debug) { "AnyCable PID: #{pid}" }
-
-          @running = true
-
-          at_exit { stop }
-        end
-
-        def stop
-          return unless running
-
-          log(:debug) { "Terminate PID: #{pid}" }
-
-          Process.kill("SIGKILL", pid)
-
-          @running = false
-        end
-
-        def running?
-          running == true
-        end
-      end
-    end
-  end
-end