anycable-rack-server 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61ac3aaa885caabfc4e6761dc77f3c8f792d966c13dc598b6c100c58c160c334
-  data.tar.gz: f1317d8d0b6d38266bd8c9f6866c2d4e1e7e24225b758d2e8c06ef6176251cc4
+  metadata.gz: ac33d07a88c1d94d982a7068f7636fc74013dd13e18a08ba29019c1b6e90bdb1
+  data.tar.gz: c655148349178d792f6609202762845189669053a14f89aa4a5f0c6efae67ff6
 SHA512:
-  metadata.gz: 577a63b90c45172860302d22893db7828f748a80dc3fe8443a819c78b4c91eed10d61fecf70e6d8aeb00f50daa667cb31d9dcfe661d73e20ae65027ebbdb6a87
-  data.tar.gz: 4d1c8fa0810a6ea93ebebcbbc868e0713e648cebfe1af0d6761205b396b0a44cc2c79b716f50d740314c8d8faa382f873124e60275430563faa8460e019754b6
+  metadata.gz: 4ecbcb8c30cfa5e4b79948bc37c06405068d80bb192f53d98901d7177110da4822a20eff456a12fb7da5e7a3c3f8757ad219acb0befb2d7cd705288b3b1a3b12
+  data.tar.gz: a687c493138b5e0c7429e6a58c1b99ea4388a8b988988f0cc4bcab656db4789494e6b0fb05d59936794dfb6a99dc1b4868b90f82c551c049a2c33cf1c9c78d98

data/lib/anycable/rack/broadcast_subscribers/base_subscriber.rb

@@ -32,7 +32,7 @@ module AnyCable
           if data["stream"]
             hub.broadcast(data["stream"], data["data"], coder)
           elsif data["command"] == "disconnect"
-            hub.disconnect(data["payload"]["identifier"], data["payload"]["reconnect"])
+            hub.disconnect(data["payload"]["identifier"], data["payload"]["reconnect"], coder)
           end
         end
       end

data/lib/anycable/rack/coders/json.rb

@@ -5,7 +5,7 @@ require "json"
 module AnyCable
   module Rack
     module Coders
-      module JSON # :nodoc:
+      module Json # :nodoc:
         class << self
           def decode(json_str)
             ::JSON.parse(json_str)

data/lib/anycable/rack/coders/msgpack.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+gem "msgpack", "~> 1.4"
+require "msgpack"
+
+module AnyCable
+  module Rack
+    module Coders
+      module Msgpack # :nodoc:
+        class << self
+          def decode(bin)
+            MessagePack.unpack(bin)
+          end
+
+          def encode(ruby_obj)
+            BinaryFrame.new(MessagePack.pack(ruby_obj))
+          end
+        end
+      end
+    end
+  end
+end

data/lib/anycable/rack/config.rb

@@ -12,6 +12,7 @@ module AnyCable
 
       attr_config mount_path: "/cable",
                   headers: DEFAULT_HEADERS,
+                  coder: :json,
                   rpc_addr: "localhost:50051",
                   rpc_client_pool_size: 5,
                   rpc_client_timeout: 5,

data/lib/anycable/rack/connection.rb

@@ -67,7 +67,8 @@ module AnyCable
       private
 
       def transmit(cable_message)
-        socket.transmit(encode(cable_message))
+        encoded = encode(cable_message)
+        socket.transmit(encoded)
       end
 
       def close
@@ -133,7 +134,7 @@ module AnyCable
       end
 
       def process_command(response, identifier)
-        response.transmissions.each { |transmission| transmit(decode(transmission)) }
+        response.transmissions.each { |transmission| transmit(decode_transmission(transmission)) }
         hub.remove_channel(socket, identifier) if response.stop_streams
         response.streams.each { |stream| hub.add_subscriber(stream, socket, identifier) }
         response.stopped_streams.each { |stream| hub.remove_subscriber(stream, socket, identifier) }
@@ -145,7 +146,7 @@ module AnyCable
       end
 
       def process_open(response)
-        response.transmissions&.each { |transmission| transmit(decode(transmission)) }
+        response.transmissions&.each { |transmission| transmit(decode_transmission(transmission)) }
         if response.status == :SUCCESS
           @_identifiers = response.identifiers
           @_cstate = response.env.cstate&.to_h || {}
@@ -181,6 +182,10 @@ module AnyCable
         coder.encode(cable_message)
       end
 
+      def decode_transmission(json_message)
+        JSON.parse(json_message)
+      end
+
       def decode(websocket_message)
         coder.decode(websocket_message)
       end

data/lib/anycable/rack/hub.rb

@@ -71,7 +71,7 @@ module AnyCable
         end
 
         list.each do |(channel_id, sockets)|
-          decoded = coder.decode(message)
+          decoded = JSON.parse(message)
           cmessage = channel_message(channel_id, decoded, coder)
           sockets.each { |socket| socket.transmit(cmessage) }
         end
@@ -81,14 +81,14 @@ module AnyCable
         sockets.each_key { |socket| socket.transmit(message) }
       end
 
-      def disconnect(identifier, reconnect)
+      def disconnect(identifier, reconnect, coder)
         sockets = @sync.synchronize do
           return unless @streams[INTERNAL_STREAM].key?(identifier)
 
           @streams[INTERNAL_STREAM][identifier].to_a
         end
 
-        msg = disconnect_message("remote", reconnect)
+        msg = disconnect_message("remote", reconnect, coder)
 
         sockets.each do |socket|
           socket.transmit(msg)
@@ -115,9 +115,8 @@ module AnyCable
         coder.encode(identifier: channel_id, message: message)
       end
 
-      # FIXME: coder support?
-      def disconnect_message(reason, reconnect)
-        {type: :disconnect, reason: reason, reconnect: reconnect}.to_json
+      def disconnect_message(reason, reconnect, coder)
+        coder.encode({type: :disconnect, reason: reason, reconnect: reconnect})
       end
     end
   end

data/lib/anycable/rack/middleware.rb

@@ -9,7 +9,7 @@ require "anycable/rack/socket"
 module AnyCable
   module Rack
     class Middleware # :nodoc:
-      PROTOCOLS = ["actioncable-v1-json", "actioncable-unsupported"].freeze
+      PROTOCOLS = ["actioncable-v1-json", "actioncable-v1-msgpack", "actioncable-unsupported"].freeze
       attr_reader :pinger,
         :hub,
         :coder,

data/lib/anycable/rack/pinger.rb

@@ -8,7 +8,10 @@ module AnyCable
     class Pinger
       INTERVAL = 3
 
-      def initialize
+      attr_reader :coder
+
+      def initialize(coder)
+        @coder = coder
         @_sockets = []
         @_stopped = false
       end
@@ -45,7 +48,7 @@ module AnyCable
       private
 
       def ping_message(time)
-        {type: :ping, message: time}.to_json
+        coder.encode({type: :ping, message: time})
       end
     end
   end

data/lib/anycable/rack/server.rb

@@ -8,7 +8,6 @@ require "anycable/rack/errors"
 require "anycable/rack/middleware"
 require "anycable/rack/logging"
 require "anycable/rack/broadcast_subscribers/base_subscriber"
-require "anycable/rack/coders/json"
 
 module AnyCable # :nodoc: all
   module Rack
@@ -28,9 +27,8 @@ module AnyCable # :nodoc: all
       def initialize(config: AnyCable::Rack.config)
         @config = config
         @hub = Hub.new
-        @pinger = Pinger.new
-        # TODO: Support other coders
-        @coder = Coders::JSON
+        @coder = resolve_coder(config.coder)
+        @pinger = Pinger.new(coder)
 
         @broadcast = resolve_broadcast_adapter
         @rpc_client = RPC::Client.new(
@@ -112,6 +110,11 @@ module AnyCable # :nodoc: all
           raise ArgumentError, "Unsupported broadcast adatper: #{adapter}. AnyCable Rack server only supports: redis, http"
         end
       end
+
+      def resolve_coder(name)
+        require "anycable/rack/coders/#{name}"
+        AnyCable::Rack::Coders.const_get(name.capitalize)
+      end
     end
   end
 end

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
@@ -22,7 +33,9 @@ module AnyCable
         @_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,
@@ -144,7 +157,7 @@ module AnyCable
           end
         end
       rescue Exception => e # rubocop:disable Lint/RescueException
-        log(:error, "Socket frame error: #{e}")
+        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.3.0"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: anycable-rack-server
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Yulia Oletskaya
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-12 00:00:00.000000000 Z
+date: 2021-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anyway_config
@@ -170,6 +170,7 @@ files:
 - 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