litecable 0.4.2 → 0.7.2

data/lib/lite_cable/coders.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module LiteCable
   module Coders # :nodoc:
     require "lite_cable/coders/raw"

data/lib/lite_cable/coders/json.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "json"
 
 module LiteCable

data/lib/lite_cable/coders/raw.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module LiteCable
   module Coders
     # No-op coder
@@ -8,7 +9,7 @@ module LiteCable
           val
         end
 
-        alias encode decode
+        alias_method :encode, :decode
       end
     end
   end

data/lib/lite_cable/config.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
-require "anyway"
-require 'logger'
+
+require "anyway_config"
+require "logger"
 
 module LiteCable
-  # Anycable configuration
+  # AnyCable configuration
   class Config < Anyway::Config
     require "lite_cable/coders/json"
     require "lite_cable/coders/raw"
@@ -11,8 +12,9 @@ module LiteCable
     config_name :litecable
 
     attr_config :logger,
-                coder: Coders::JSON,
-                identifier_coder: Coders::Raw,
-                log_level: Logger::INFO
+      coder: Coders::JSON,
+      broadcast_adapter: :memory,
+      identifier_coder: Coders::Raw,
+      log_level: Logger::INFO
   end
 end

data/lib/lite_cable/connection.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module LiteCable
   module Connection # :nodoc:
     require "lite_cable/connection/authorization"

data/lib/lite_cable/connection/authorization.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module LiteCable
   module Connection
     class UnauthorizedError < StandardError; end

data/lib/lite_cable/connection/base.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
+
 module LiteCable
-  # rubocop:disable Metrics/LineLength
   module Connection
     # A Connection object represents a client "connected" to the application.
     # It contains all of the channel subscriptions. Incoming messages are then routed to these channel subscriptions
@@ -37,7 +37,6 @@ module LiteCable
     # it easy to use cookies that were set when logging in via a web interface to authorize the connection.
     #
     class Base
-      # rubocop:enable Metrics/LineLength
       include Authorization
       prepend Identification
       include Logging
@@ -79,6 +78,7 @@ module LiteCable
 
       def transmit(cable_message)
         return if disconnected?
+
         socket.transmit encode(cable_message)
       end
 

data/lib/lite_cable/connection/identification.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "set"
 
 module LiteCable
@@ -13,6 +14,7 @@ module LiteCable
             define_method(identifier) do
               return instance_variable_get(:"@#{identifier}") if
                 instance_variable_defined?(:"@#{identifier}")
+
               fetch_identifier(identifier.to_s)
             end
           end
@@ -66,6 +68,7 @@ module LiteCable
         identifiers.each_with_object({}) do |id, acc|
           obj = instance_variable_get("@#{id}")
           next unless obj
+
           acc[id.to_s] = LiteCable.config.identifier_coder.encode(obj)
         end
       end

data/lib/lite_cable/connection/streams.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module LiteCable
   module Connection
     # Manage the connection streams

data/lib/lite_cable/connection/subscriptions.rb

@@ -1,11 +1,15 @@
 # frozen_string_literal: true
+
 module LiteCable
   module Connection
     # Manage the connection channels and route messages
     class Subscriptions
       class Error < StandardError; end
+
       class AlreadySubscribedError < Error; end
+
       class UnknownCommandError < Error; end
+
       class ChannelNotFoundError < Error; end
 
       include Logging
@@ -52,9 +56,9 @@ module LiteCable
       def execute_command(data)
         command = data.delete("command")
         case command
-        when "subscribe"   then add(data["identifier"])
+        when "subscribe" then add(data["identifier"])
         when "unsubscribe" then remove(data["identifier"])
-        when "message"     then perform_action(data["identifier"], data["data"])
+        when "message" then perform_action(data["identifier"], data["data"])
         else
           raise UnknownCommandError, "Command not found #{command}"
         end
@@ -67,6 +71,7 @@ module LiteCable
       def find!(identifier)
         channel = find(identifier)
         raise ChannelNotFoundError unless channel
+
         channel
       end
 
@@ -87,17 +92,17 @@ module LiteCable
 
       def transmit_subscription_confirmation(identifier)
         connection.transmit identifier: identifier,
-                            type: LiteCable::INTERNAL[:message_types][:confirmation]
+          type: LiteCable::INTERNAL[:message_types][:confirmation]
       end
 
       def transmit_subscription_rejection(identifier)
         connection.transmit identifier: identifier,
-                            type: LiteCable::INTERNAL[:message_types][:rejection]
+          type: LiteCable::INTERNAL[:message_types][:rejection]
       end
 
       def transmit_subscription_cancel(identifier)
         connection.transmit identifier: identifier,
-                            type: LiteCable::INTERNAL[:message_types][:cancel]
+          type: LiteCable::INTERNAL[:message_types][:cancel]
       end
 
       def log_fmt(msg)

data/lib/lite_cable/internal.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module LiteCable
   INTERNAL = {
     message_types: {

data/lib/lite_cable/logging.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-require 'logger'
+
+require "logger"
 
 module LiteCable
   module Logging # :nodoc:
@@ -12,7 +13,7 @@ module LiteCable
         @logger = LiteCable.config.logger
         return if @logger == false
 
-        @logger ||= ::Logger.new(STDERR).tap do |logger|
+        @logger ||= ::Logger.new($stderr).tap do |logger|
           logger.level = LiteCable.config.log_level
         end
       end
@@ -22,6 +23,7 @@ module LiteCable
 
     def log(level, message = nil)
       return unless LiteCable::Logging.logger
+
       LiteCable::Logging.logger.send(level, PREFIX) { message || yield }
     end
   end

data/lib/lite_cable/server.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module LiteCable
   # Rack middleware to hijack sockets.
   #
@@ -14,12 +15,6 @@ module LiteCable
 
     class << self
       attr_accessor :subscribers_map
-
-      # Broadcast encoded message to the stream
-      def broadcast(stream, message, coder: nil)
-        coder ||= LiteCable.config.coder
-        subscribers_map.broadcast stream, message, coder
-      end
     end
 
     self.subscribers_map = SubscribersMap.new

data/lib/lite_cable/server/client_socket.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module LiteCable
   module Server
     module ClientSocket # :nodoc:

data/lib/lite_cable/server/client_socket/base.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
+
 module LiteCable
   module Server
     module ClientSocket
       # Wrapper over web socket
-      # rubocop:disable Metrics/ClassLength
       class Base
         include Logging
         include Subscriptions
@@ -17,10 +17,10 @@ module LiteCable
           @version = version
           @active = true
 
-          @open_handlers    = []
+          @open_handlers = []
           @message_handlers = []
-          @close_handlers   = []
-          @error_handlers   = []
+          @close_handlers = []
+          @error_handlers = []
 
           @close_on_error = true
         end
@@ -36,6 +36,9 @@ module LiteCable
             type: type
           )
           socket.write frame.to_s
+        rescue EOFError, Errno::ECONNRESET => e
+          log(:debug, "Socket gone: #{e}")
+          close
         rescue IOError, Errno::EPIPE, Errno::ETIMEDOUT => e
           log(:error, "Socket send failed: #{e}")
           close
@@ -61,6 +64,7 @@ module LiteCable
           @error_handlers << block
         end
 
+        # rubocop: disable Metrics/MethodLength
         def listen
           keepalive
           Thread.new do
@@ -69,13 +73,11 @@ module LiteCable
               @open_handlers.each(&:call)
               each_frame do |data|
                 @message_handlers.each do |h|
-                  begin
-                    h.call(data)
-                  rescue => e
-                    log(:error, "Socket receive failed: #{e}")
-                    @error_handlers.each { |eh| eh.call(e, data) }
-                    close if close_on_error
-                  end
+                  h.call(data)
+                rescue => e # rubocop: disable Style/RescueStandardError
+                  log(:error, "Socket receive failed: #{e}")
+                  @error_handlers.each { |eh| eh.call(e, data) }
+                  close if close_on_error
                 end
               end
             ensure
@@ -83,6 +85,7 @@ module LiteCable
             end
           end
         end
+        # rubocop: enable Metrics/MethodLength
 
         def close
           return unless @active
@@ -131,22 +134,15 @@ module LiteCable
           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
-            end
+            data = socket.respond_to?(:recv) ? socket.recv(2000) : socket.readpartial(2000)
             break if data.empty?
+
             framebuffer << data
-            while frame = framebuffer.next
+            while frame = framebuffer.next # rubocop:disable Lint/AssignmentInCondition
               case frame.type
               when :close
                 return

data/lib/lite_cable/server/client_socket/subscriptions.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module LiteCable
   module Server
     module ClientSocket
@@ -6,12 +7,12 @@ module LiteCable
       module Subscriptions
         def subscribe(channel, broadcasting)
           LiteCable::Server.subscribers_map
-                           .add_subscriber(broadcasting, self, channel)
+            .add_subscriber(broadcasting, self, channel)
         end
 
         def unsubscribe(channel, broadcasting)
           LiteCable::Server.subscribers_map
-                           .remove_subscriber(broadcasting, self, channel)
+            .remove_subscriber(broadcasting, self, channel)
         end
 
         def unsubscribe_from_all(channel)

data/lib/lite_cable/server/heart_beat.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module LiteCable
   module Server
     # Sends pings to sockets
@@ -22,6 +23,7 @@ module LiteCable
         @stopped = true
       end
 
+      # rubocop: disable Metrics/MethodLength
       def run
         Thread.new do
           Thread.current.abort_on_exception = true
@@ -39,11 +41,12 @@ module LiteCable
           end
         end
       end
+      # rubocop: enable Metrics/MethodLength
 
       private
 
       def ping_message(time)
-        { type: LiteCable::INTERNAL[:message_types][:ping], message: time }.to_json
+        {type: LiteCable::INTERNAL[:message_types][:ping], message: time}.to_json
       end
     end
   end

data/lib/lite_cable/server/middleware.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module LiteCable
   module Server
     # Rack middleware to hijack the socket
@@ -11,15 +12,15 @@ module LiteCable
       end
 
       def call(env)
-        return [404, { 'Content-Type' => 'text/plain' }, ['Not Found']] unless
-          env["HTTP_UPGRADE"] == 'websocket'
+        return [404, {"Content-Type" => "text/plain"}, ["Not Found"]] unless
+          env["HTTP_UPGRADE"] == "websocket"
 
-        raise HijackNotAvailable unless env['rack.hijack']
+        raise HijackNotAvailable unless env["rack.hijack"]
 
-        env['rack.hijack'].call
+        env["rack.hijack"].call
         handshake = send_handshake(env)
 
-        socket = ClientSocket::Base.new env, env['rack.hijack_io'], handshake.version
+        socket = ClientSocket::Base.new env, env["rack.hijack_io"], handshake.version
         init_connection socket
         init_heartbeat socket
         socket.listen
@@ -34,7 +35,7 @@ module LiteCable
         )
 
         handshake.from_rack env
-        env['rack.hijack_io'].write handshake.to_s
+        env["rack.hijack_io"].write handshake.to_s
         handshake
       end
 

data/lib/lite_cable/server/subscribers_map.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module LiteCable
   module Server
     # From https://github.com/rails/rails/blob/v5.0.1/actioncable/lib/action_cable/subscription_adapter/subscriber_map.rb
@@ -31,6 +32,7 @@ module LiteCable
       def remove_socket(socket, channel)
         list = @sync.synchronize do
           return unless @sockets.key?(socket)
+
           @sockets[socket].dup
         end
 
@@ -42,6 +44,7 @@ module LiteCable
       def broadcast(stream, message, coder)
         list = @sync.synchronize do
           return unless @streams.key?(stream)
+
           @streams[stream].to_a
         end
 

data/lib/lite_cable/version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module LiteCable
-  VERSION = "0.4.2"
+  VERSION = "0.7.2"
 end