anycable-core 1.4.0.rc.1 → 1.4.0.rc.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 694b7faf93867160692c90662d8fd65af0e5f7303688ae1fe387b3bae534bb00
-  data.tar.gz: 92f687a99d704322486551e9d29d82e97a2f15e63c3e8e0a2c592e5ebc58cae2
+  metadata.gz: 737d6a61d9703667767212bb560fe63974749f689b35d214ac7a83e19b22b3cf
+  data.tar.gz: 10c05cf944bf608b8bdbb408a116688d29122511964502c0e88ab44256cdbaca
 SHA512:
-  metadata.gz: aea5bfe49b5d0d0a818536cde34cc9620eb8b39bf07b526a81b62e3dad45a304f00127c1158f741487efe309004b5ae13fdade338533416c7cbbfe0b275f4fda
-  data.tar.gz: 408901c32e70e72d3b69f183dea2475c3b8b0a02b7c355a453f0d46d4d698cb9b2b772d106ddfa3f6f50aa1f6f367f48f6e8987c4df1c3c6abc2670d104561e9
+  metadata.gz: ffcc587a711bec5bef6d7fb677b3e20d85365c19ae7ed9c2ad081cfce216c68c648e6792d43749708330a5cb69f8a1edea6466ddd5fad5b05fcf51686f922ed9
+  data.tar.gz: 196436a8cece7e55a1dd7e44292ff9b3bef50dd06d8cb1d1e96dd9eab383bd4ee74a078d76687852e3136fc466aa46ae4edf92dbd93fabe045ae83caa7d2054b

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## master
 
+## 1.4.0.rc.3 (2023-07-04)
+
+- Fix HTTP RPC protobuf-to-json encoding. ([@palkan][])
+
+## 1.4.0.rc.2 (2023-07-03)
+
+- Add HTTP RPC support. ([@palkan][])
+
 ## 1.4.0.rc.1 (2023-06-01)
 
 - Add `redisx` broadcast adapter. ([@palkan][])

data/lib/anycable/config.rb

@@ -53,6 +53,9 @@ module AnyCable
       http_health_port: nil,
       http_health_path: "/health",
 
+      ### HTTP RPC options
+      http_rpc_secret: nil,
+
       ### Misc options
       version_check_enabled: true,
       sid_header_enabled: true
@@ -110,6 +113,9 @@ module AnyCable
       HTTP PUB/SUB
           --http-broadcast-url              HTTP pub/sub endpoint URL, default: "http://localhost:8090/_broadcast"
           --http-broadcast-secret           HTTP pub/sub authorization secret, default: <none> (disabled)
+
+      HTTP RPC
+          --http-rpc-secret                 HTTP RPC authorization secret, default: <none> (disabled)
     TXT
 
     # Build Redis parameters

data/lib/anycable/httrpc/server.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module AnyCable
+  module HTTRPC
+    class Server
+      def initialize(token: AnyCable.config.http_rpc_secret)
+        @token = token
+      end
+
+      def call(env)
+        if env["REQUEST_METHOD"] != "POST"
+          return [404, {}, ["Not found"]]
+        end
+
+        if token && env["HTTP_AUTHORIZATION"] != "Bearer #{token}"
+          return [401, {}, ["Unauthorized"]]
+        end
+
+        rpc_command = env["PATH_INFO"].sub(%r{^/}, "").to_sym
+
+        # check if command is supported and return 404 if not
+        return [404, {}, ["Not found"]] unless AnyCable.rpc_handler.supported?(rpc_command)
+
+        # read request body and it's empty, return 422
+        request_body = env["rack.input"].read
+        return [422, {}, ["Empty request body"]] if request_body.empty?
+
+        payload =
+          case rpc_command
+          when :connect then AnyCable::ConnectionRequest.decode_json(request_body)
+          when :disconnect then AnyCable::DisconnectRequest.decode_json(request_body)
+          when :command then AnyCable::CommandMessage.decode_json(request_body)
+          end
+
+        return [422, {}, ["Invalid request body"]] if payload.nil?
+
+        response = AnyCable.rpc_handler.handle(rpc_command, payload, build_meta(env))
+
+        [200, {}, [response.to_json({format_enums_as_integers: true, preserve_proto_fieldnames: true})]]
+      rescue JSON::ParserError, ArgumentError => e
+        [422, {}, ["Invalid request body: #{e.message}"]]
+      end
+
+      private
+
+      attr_reader :token
+
+      def build_meta(env)
+        # `x-anycable-meta-var` -> `meta["var"]`
+        env.each_with_object({}) do |(k, v), meta|
+          next unless k.start_with?("HTTP_X_ANYCABLE_META_")
+          meta[k.sub(%r{^HTTP_X_ANYCABLE_META_}, "").downcase] = v
+          meta
+        end
+      end
+    end
+  end
+end

data/lib/anycable/rpc/handler.rb

@@ -23,6 +23,10 @@ module AnyCable
         end
       end
 
+      def supported?(cmd)
+        %i[connect disconnect command].include?(cmd)
+      end
+
       private
 
       attr_reader :commands, :middleware

data/lib/anycable/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AnyCable
-  VERSION = "1.4.0.rc.1"
+  VERSION = "1.4.0.rc.3"
 end

data/lib/anycable.rb

@@ -16,6 +16,8 @@ require "anycable/socket"
 require "anycable/rpc"
 require "anycable/health_server"
 
+require "anycable/httrpc/server"
+
 # AnyCable allows to use any websocket service (written in any language) as a replacement
 # for ActionCable server.
 #

data/sig/anycable/config.rbs

@@ -41,6 +41,8 @@ module AnyCable
     def http_health_port=: (Integer) -> void
     def http_health_path: () -> String
     def http_health_path=: (String) -> void
+    def http_rpc_secret: () -> String
+    def http_rpc_secret=: (String) -> void
     def version_check_enabled: () -> bool
     def version_check_enabled=: (bool) -> void
     def version_check_enabled?: () -> bool

data/sig/anycable/httrpc/server.rbs

@@ -0,0 +1,11 @@
+module AnyCable
+  module HTTRPC
+    class Server
+      def initialize: (?token: String?) -> void
+      def call: (Hash[String, untyped] env) -> [Integer, Hash[String, String], Array[String]]
+      private
+      attr_reader token: String?
+      def build_meta: (Hash[String, untyped] env) -> Hash[String, String]
+    end
+  end
+end

data/sig/anycable/rpc/handler.rbs

@@ -15,6 +15,7 @@ module AnyCable
 
       def initialize: (?middleware: MiddlewareChain) -> void
       def handle: (Symbol cmd, rpcRequest data, ?rpcMetadata meta) -> rpcResponse
+      def supported?: (Symbol cmd) -> bool
 
       private
 

data/sig/anycable/rpc.rbs

@@ -73,6 +73,7 @@ module AnyCable
   class ConnectionRequest
     include _WithEnv
 
+    def self.decode_json: (String) -> instance
     %a{rbs:test:skip} def initialize: (?env: Env) -> void
     def to_h: () -> Hash[Symbol, untyped]
   end
@@ -95,11 +96,14 @@ module AnyCable
     ) -> void
 
     def to_h: () -> Hash[Symbol, untyped]
+    def to_json: (?Hash[Symbol, untyped] options) -> String
   end
 
   class CommandMessage
     include _WithEnv
 
+    def self.decode_json: (String) -> instance
+
     attr_accessor command: String
     attr_accessor identifier: String
     attr_accessor connection_identifiers: String
@@ -139,11 +143,14 @@ module AnyCable
     ) -> void
 
     def to_h: () -> Hash[Symbol, untyped]
+    def to_json: (?Hash[Symbol, untyped] options) -> String
   end
 
   class DisconnectRequest
     include _WithEnv
 
+    def self.decode_json: (String) -> instance
+
     attr_accessor identifiers: String
     attr_accessor subscriptions: Array[String]
 
@@ -159,6 +166,7 @@ module AnyCable
 
     %a{rbs:test:skip} def initialize: (status: rpcStatus, ?error_msg: String) -> void
     def to_h: () -> Hash[Symbol, untyped]
+    def to_json: (?Hash[Symbol, untyped] options) -> String
   end
 
   type rpcRequest = ConnectionRequest | DisconnectRequest | CommandMessage

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anycable-core
 version: !ruby/object:Gem::Version
-  version: 1.4.0.rc.1
+  version: 1.4.0.rc.3
 platform: ruby
 authors:
 - palkan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-01 00:00:00.000000000 Z
+date: 2023-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anyway_config
@@ -216,6 +216,7 @@ files:
 - lib/anycable/grpc_kit/health_services_pb.rb
 - lib/anycable/grpc_kit/server.rb
 - lib/anycable/health_server.rb
+- lib/anycable/httrpc/server.rb
 - lib/anycable/middleware.rb
 - lib/anycable/middleware_chain.rb
 - lib/anycable/middlewares/check_version.rb
@@ -246,6 +247,7 @@ files:
 - sig/anycable/grpc/rpc_services_pb.rbs
 - sig/anycable/grpc/server.rbs
 - sig/anycable/health_server.rbs
+- sig/anycable/httrpc/server.rbs
 - sig/anycable/middleware.rbs
 - sig/anycable/middleware_chain.rbs
 - sig/anycable/middlewares/check_version.rbs