anycable 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9044b4ce81ea84415ac896ea46c96ad55da523edc3251aa07d7e2490c3a4745e
-  data.tar.gz: 1bfe649fe5bfac2276496668f7fa3e588f38a6c1b0e603d16a3b3695f08a8363
+  metadata.gz: 982192dbe84e0576b13033aadf3ead0238e28bf4c30b6dec2d08228cd2093f3c
+  data.tar.gz: 9af924544238340e0c5b171a738b9bec99ebe25c13cc398d279318f6c9cbef12
 SHA512:
-  metadata.gz: 415117187f998d7704e9a2d1a305b0fb8cc55b2cdaf58a37292043675bc499e32b806cd2a5a574210f54f16ea91fa7f072cc87d37afec860f13c1abbc9978813
-  data.tar.gz: 5ed3809fe24065e2d029e4cfd92f794112ed1b08cf3ed312e56f5a97cd5e23b51be4f9425303e55b18d9cb41d9143ce639ab60556c34511746994ba9c4d78027
+  metadata.gz: ba03a684ddce90df929c469deb4b219a494578ab9c203321e9c9f900810f98132eb74d8fc16aa1b79c6042c28bd5b3da2ac83d39bd4e25944127191dc4b2f8b7
+  data.tar.gz: 77a874ad448dff0cca9d8ada4259c8c48ab4fdb87d1df1f3c6bee1dab50f23335f1fc390ee60fb96483a89cc0071700945bdffa73f908745987de2c2e7877c91

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## master
 
+## 0.6.3 (2019-03-26)
+
+- Relax `redis` gem version requirement. ([@palkan][])
+
+Use the same restriction as Action Cable does (`>= 3`).
+
 ## 0.6.2 (2019-03-15)
 
 - Add GRPC service method name and message content to exception notifications ([@sponomarev][])

data/lib/anycable/broadcast_adapters/redis.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-gem "redis", ">= 4.0"
+gem "redis", ">= 3"
 
 require "redis"
 require "json"

data/lib/anycable/rpc_handler.rb

@@ -4,15 +4,12 @@ require "anycable/socket"
 require "anycable/rpc/rpc_pb"
 require "anycable/rpc/rpc_services_pb"
 
-require "anycable/handler/capture_exceptions"
-
 # rubocop:disable Metrics/AbcSize
 # rubocop:disable Metrics/MethodLength
+# rubocop:disable Metrics/ClassLength
 module AnyCable
   # RPC service handler
   class RPCHandler < AnyCable::RPC::Service
-    prepend AnyCable::Handler::CaptureExceptions
-
     # Handle connection request from WebSocket server
     def connect(request, _unused_call)
       logger.debug("RPC Connect: #{request.inspect}")
@@ -32,6 +29,13 @@ module AnyCable
           transmissions: socket.transmissions
         )
       end
+    rescue StandardError => exp
+      notify_exception(exp, :connect, request)
+
+      AnyCable::ConnectionResponse.new(
+        status: AnyCable::Status::ERROR,
+        error_msg: exp.message
+      )
     end
 
     def disconnect(request, _unused_call)
@@ -50,6 +54,13 @@ module AnyCable
       else
         AnyCable::DisconnectResponse.new(status: AnyCable::Status::FAILURE)
       end
+    rescue StandardError => exp
+      notify_exception(exp, :disconnect, request)
+
+      AnyCable::DisconnectResponse.new(
+        status: AnyCable::Status::ERROR,
+        error_msg: exp.message
+      )
     end
 
     def command(message, _unused_call)
@@ -75,6 +86,13 @@ module AnyCable
         streams: socket.streams,
         transmissions: socket.transmissions
       )
+    rescue StandardError => exp
+      notify_exception(exp, :command, message)
+
+      AnyCable::CommandResponse.new(
+        status: AnyCable::Status::ERROR,
+        error_msg: exp.message
+      )
     end
 
     private
@@ -114,7 +132,12 @@ module AnyCable
     def factory
       AnyCable.connection_factory
     end
+
+    def notify_exception(exp, method_name, message)
+      AnyCable::ExceptionsHandling.notify(exp, method_name.to_s, message.to_h)
+    end
   end
 end
 # rubocop:enable Metrics/AbcSize
 # rubocop:enable Metrics/MethodLength
+# rubocop:enable Metrics/ClassLength

data/lib/anycable/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AnyCable
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anycable
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - palkan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-15 00:00:00.000000000 Z
+date: 2019-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anyway_config
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.60.0
+        version: 0.65.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.60.0
+        version: 0.65.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -172,7 +172,6 @@ files:
 - lib/anycable/cli.rb
 - lib/anycable/config.rb
 - lib/anycable/exceptions_handling.rb
-- lib/anycable/handler/capture_exceptions.rb
 - lib/anycable/health_server.rb
 - lib/anycable/middleware.rb
 - lib/anycable/middleware_chain.rb

data/lib/anycable/handler/capture_exceptions.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-require "anycable/rpc/rpc_pb"
-
-module AnyCable
-  module Handler # :nodoc:
-    # Handle app-level errors.
-    #
-    # NOTE: this functionality couldn't be implemeted
-    # as middleware, 'cause interceptors do not support
-    # aborting the call and returning a data
-    module CaptureExceptions
-      RESPONSE_CLASS = {
-        command: AnyCable::CommandResponse,
-        connect: AnyCable::ConnectionResponse,
-        disconnect: AnyCable::DisconnectResponse
-      }.freeze
-
-      RESPONSE_CLASS.keys.each do |mid|
-        module_eval <<~CODE, __FILE__, __LINE__ + 1
-          def #{mid}(message, *)
-            capture_exceptions(:#{mid}, message) { super }
-          end
-        CODE
-      end
-
-      def capture_exceptions(method_name, message)
-        yield
-      rescue StandardError => exp
-        AnyCable::ExceptionsHandling.notify(exp, method_name.to_s, message.to_h)
-
-        RESPONSE_CLASS.fetch(method_name).new(
-          status: AnyCable::Status::ERROR,
-          error_msg: exp.message
-        )
-      end
-    end
-  end
-end