anycable-core 1.5.0 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51822ff8e8b07d8967dfaeed99b65c45e7cf8a2d3868f94f09dd81a26d934bd8
-  data.tar.gz: d782bdda587a181716bd0d6dc0aa19d0a6c24b0236b0cb3aa3354100364839a8
+  metadata.gz: 471f65d8e5181aad39ec9b4ed537b6b7721ce39aef220a450089106cdad55944
+  data.tar.gz: fd511a291e8931d324fed2c9e3847de18e4815fc2ffecd86d5736f19b8b73855
 SHA512:
-  metadata.gz: f2f48cae19656f6b3360f8173a76d91ec2e6bf87434c7b8ccc00e3fae5dd3f89542f8d545348944b2eee90068833cc74fbf33be929885eb0427c019f9a0c9ba1
-  data.tar.gz: 00a17dedd9dd6f572aca18fe08f77d5d234c5b5636497f2b925b5dafbb230c4b918d4a4fa5a020d1adb612d9c11528554579e9ec81589b336081792249029a3d
+  metadata.gz: 9fac18169b44904b6cef45881a95d3e0e0e99e8410dc244847a3a72511390d6f09c90ce4702201eed440e5d1c7403032dee2bee652878b8398e6351081e11ab2
+  data.tar.gz: 5861b7974c45f5c84e8a29a95fd9684e7b660bb7ce14596289a67b3b9784c777001179f1adfff85f9105ad4b93c7cce26ef04c0b310962cd904a4903d927a465

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## master
 
+## 1.5.2 (2024-12-27)
+
+- Update google-protobuf to version 4 (support Ruby 3.4). ([@le0pard][])
+
+## 1.5.1 (2024-06-14) 🇪🇺 ⚽️
+
+- Fixed compatibility with Rack 3.1 ([@earlopain][])
+
 ## 1.5.0 (2024-04-01)
 
 - Fixed gRPC keepalive settings to align with the Go server client. ([@palkan][])
@@ -211,3 +219,5 @@ See [Changelog](https://github.com/anycable/anycable/blob/0-6-stable/CHANGELOG.m
 [@smasry]: https://github.com/smasry
 [@Envek]: https://github.com/Envek
 [@cylon-v]: https://github.com/cylon-v
+[@earlopain]: https://github.com/earlopain
+[@le0pard]: https://github.com/le0pard

data/lib/anycable/grpc_kit/health_pb.rb

@@ -5,19 +5,10 @@
 
 require 'google/protobuf'
 
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "grpc.health.v1.HealthCheckRequest" do
-    optional :service, :string, 1
-  end
-  add_message "grpc.health.v1.HealthCheckResponse" do
-    optional :status, :enum, 1, "grpc.health.v1.HealthCheckResponse.ServingStatus"
-  end
-  add_enum "grpc.health.v1.HealthCheckResponse.ServingStatus" do
-    value :UNKNOWN, 0
-    value :SERVING, 1
-    value :NOT_SERVING, 2
-  end
-end
+descriptor_data = "\n\x1bgrpc/health/v1/health.proto\x12\x0egrpc.health.v1\"%\n\x12HealthCheckRequest\x12\x0f\n\x07service\x18\x01 \x01(\t\"\xa9\x01\n\x13HealthCheckResponse\x12\x41\n\x06status\x18\x01 \x01(\x0e\x32\x31.grpc.health.v1.HealthCheckResponse.ServingStatus\"O\n\rServingStatus\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x0b\n\x07SERVING\x10\x01\x12\x0f\n\x0bNOT_SERVING\x10\x02\x12\x13\n\x0fSERVICE_UNKNOWN\x10\x03\x32\xae\x01\n\x06Health\x12P\n\x05\x43heck\x12\".grpc.health.v1.HealthCheckRequest\x1a#.grpc.health.v1.HealthCheckResponse\x12R\n\x05Watch\x12\".grpc.health.v1.HealthCheckRequest\x1a#.grpc.health.v1.HealthCheckResponse0\x01\x42\x61\n\x11io.grpc.health.v1B\x0bHealthProtoP\x01Z,google.golang.org/grpc/health/grpc_health_v1\xaa\x02\x0eGrpc.Health.V1b\x06proto3"
+
+pool = Google::Protobuf::DescriptorPool.generated_pool
+pool.add_serialized_file(descriptor_data)
 
 module Grpc
   module Health

data/lib/anycable/httrpc/server.rb

@@ -27,8 +27,9 @@ module AnyCable
         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?
+        # rack.input is optional starting in Rack 3.1
+        request_body = env["rack.input"]&.read
+        return [422, {}, ["Empty request body"]] if request_body.nil? || request_body.empty?
 
         payload =
           case rpc_command

data/lib/anycable/jwt.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "base64"
 require "json"
 require "openssl"
 

data/lib/anycable/protos/rpc_pb.rb

@@ -5,61 +5,10 @@
 
 require "google/protobuf"
 
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_file("rpc.proto", syntax: :proto3) do
-    add_message "anycable.Env" do
-      optional :url, :string, 1
-      map :headers, :string, :string, 2
-      map :cstate, :string, :string, 3
-      map :istate, :string, :string, 4
-    end
-    add_message "anycable.EnvResponse" do
-      map :cstate, :string, :string, 1
-      map :istate, :string, :string, 2
-    end
-    add_message "anycable.ConnectionRequest" do
-      optional :env, :message, 3, "anycable.Env"
-    end
-    add_message "anycable.ConnectionResponse" do
-      optional :status, :enum, 1, "anycable.Status"
-      optional :identifiers, :string, 2
-      repeated :transmissions, :string, 3
-      optional :error_msg, :string, 4
-      optional :env, :message, 5, "anycable.EnvResponse"
-    end
-    add_message "anycable.CommandMessage" do
-      optional :command, :string, 1
-      optional :identifier, :string, 2
-      optional :connection_identifiers, :string, 3
-      optional :data, :string, 4
-      optional :env, :message, 5, "anycable.Env"
-    end
-    add_message "anycable.CommandResponse" do
-      optional :status, :enum, 1, "anycable.Status"
-      optional :disconnect, :bool, 2
-      optional :stop_streams, :bool, 3
-      repeated :streams, :string, 4
-      repeated :transmissions, :string, 5
-      optional :error_msg, :string, 6
-      optional :env, :message, 7, "anycable.EnvResponse"
-      repeated :stopped_streams, :string, 8
-    end
-    add_message "anycable.DisconnectRequest" do
-      optional :identifiers, :string, 1
-      repeated :subscriptions, :string, 2
-      optional :env, :message, 5, "anycable.Env"
-    end
-    add_message "anycable.DisconnectResponse" do
-      optional :status, :enum, 1, "anycable.Status"
-      optional :error_msg, :string, 2
-    end
-    add_enum "anycable.Status" do
-      value :ERROR, 0
-      value :SUCCESS, 1
-      value :FAILURE, 2
-    end
-  end
-end
+descriptor_data = "\n\trpc.proto\x12\x08\x61nycable\"\xa3\x02\n\x03\x45nv\x12\x0b\n\x03url\x18\x01 \x01(\t\x12+\n\x07headers\x18\x02 \x03(\x0b\x32\x1a.anycable.Env.HeadersEntry\x12)\n\x06\x63state\x18\x03 \x03(\x0b\x32\x19.anycable.Env.CstateEntry\x12)\n\x06istate\x18\x04 \x03(\x0b\x32\x19.anycable.Env.IstateEntry\x1a.\n\x0cHeadersEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a-\n\x0b\x43stateEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a-\n\x0bIstateEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xd1\x01\n\x0b\x45nvResponse\x12\x31\n\x06\x63state\x18\x01 \x03(\x0b\x32!.anycable.EnvResponse.CstateEntry\x12\x31\n\x06istate\x18\x02 \x03(\x0b\x32!.anycable.EnvResponse.IstateEntry\x1a-\n\x0b\x43stateEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a-\n\x0bIstateEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"/\n\x11\x43onnectionRequest\x12\x1a\n\x03\x65nv\x18\x03 \x01(\x0b\x32\r.anycable.Env\"\x99\x01\n\x12\x43onnectionResponse\x12 \n\x06status\x18\x01 \x01(\x0e\x32\x10.anycable.Status\x12\x13\n\x0bidentifiers\x18\x02 \x01(\t\x12\x15\n\rtransmissions\x18\x03 \x03(\t\x12\x11\n\terror_msg\x18\x04 \x01(\t\x12\"\n\x03\x65nv\x18\x05 \x01(\x0b\x32\x15.anycable.EnvResponse\"\x7f\n\x0e\x43ommandMessage\x12\x0f\n\x07\x63ommand\x18\x01 \x01(\t\x12\x12\n\nidentifier\x18\x02 \x01(\t\x12\x1e\n\x16\x63onnection_identifiers\x18\x03 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x04 \x01(\t\x12\x1a\n\x03\x65nv\x18\x05 \x01(\x0b\x32\r.anycable.Env\"\xd5\x01\n\x0f\x43ommandResponse\x12 \n\x06status\x18\x01 \x01(\x0e\x32\x10.anycable.Status\x12\x12\n\ndisconnect\x18\x02 \x01(\x08\x12\x14\n\x0cstop_streams\x18\x03 \x01(\x08\x12\x0f\n\x07streams\x18\x04 \x03(\t\x12\x15\n\rtransmissions\x18\x05 \x03(\t\x12\x11\n\terror_msg\x18\x06 \x01(\t\x12\"\n\x03\x65nv\x18\x07 \x01(\x0b\x32\x15.anycable.EnvResponse\x12\x17\n\x0fstopped_streams\x18\x08 \x03(\t\"[\n\x11\x44isconnectRequest\x12\x13\n\x0bidentifiers\x18\x01 \x01(\t\x12\x15\n\rsubscriptions\x18\x02 \x03(\t\x12\x1a\n\x03\x65nv\x18\x05 \x01(\x0b\x32\r.anycable.Env\"I\n\x12\x44isconnectResponse\x12 \n\x06status\x18\x01 \x01(\x0e\x32\x10.anycable.Status\x12\x11\n\terror_msg\x18\x02 \x01(\t*-\n\x06Status\x12\t\n\x05\x45RROR\x10\x00\x12\x0b\n\x07SUCCESS\x10\x01\x12\x0b\n\x07\x46\x41ILURE\x10\x02\x32\xda\x01\n\x03RPC\x12\x46\n\x07\x43onnect\x12\x1b.anycable.ConnectionRequest\x1a\x1c.anycable.ConnectionResponse\"\x00\x12@\n\x07\x43ommand\x12\x18.anycable.CommandMessage\x1a\x19.anycable.CommandResponse\"\x00\x12I\n\nDisconnect\x12\x1b.anycable.DisconnectRequest\x1a\x1c.anycable.DisconnectResponse\"\x00\x62\x06proto3"
+
+pool = Google::Protobuf::DescriptorPool.generated_pool
+pool.add_serialized_file(descriptor_data)
 
 module AnyCable
   Env = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("anycable.Env").msgclass

data/lib/anycable/socket.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "stringio"
+
 module AnyCable
   WHISPER_KEY = "$w"
 
@@ -154,22 +156,30 @@ module AnyCable
       # (not all of them though, just those enough for Action Cable to work)
       # See https://rubydoc.info/github/rack/rack/master/file/SPEC
       # and https://github.com/rack/rack/blob/master/lib/rack/lint.rb
-      {
+      env = {
         "REQUEST_METHOD" => "GET",
         "SCRIPT_NAME" => "",
         "PATH_INFO" => "/",
         "QUERY_STRING" => "",
         "SERVER_NAME" => "",
         "SERVER_PORT" => "80",
+        "SERVER_PROTOCOL" => "HTTP/1.1",
         "rack.url_scheme" => "http",
         "rack.input" => StringIO.new("", "r").tap { |io| io.set_encoding(Encoding::ASCII_8BIT) },
-        "rack.version" => ::Rack::VERSION,
         "rack.errors" => StringIO.new("").tap { |io| io.set_encoding(Encoding::ASCII_8BIT) },
         "rack.multithread" => true,
         "rack.multiprocess" => false,
         "rack.run_once" => false,
         "rack.hijack?" => false
       }
+
+      # Rack 3.1 removes `Rack::VERSION`. rack.version is optional (deprecated) since Rack 3.0
+      if ::Rack::RELEASE < "3.0"
+        rversion = ::Rack::VERSION
+        # @type var rversion : String
+        env["rack.version"] = rversion
+      end
+      env
     end
 
     def build_headers(headers)

data/lib/anycable/version.rb

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

data/sig/anycable/health_server.rbs

@@ -4,8 +4,8 @@ module AnyCable
       def running?: () -> bool
     end
 
-    SUCCESS_RESPONSE: Array[Integer | String]
-    FAILURE_RESPONSE: Array[Integer | String]
+    SUCCESS_RESPONSE: [Integer, String]
+    FAILURE_RESPONSE: [Integer, String]
 
     attr_reader server: _Runnable
     attr_reader port: Integer

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anycable-core
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.2
 platform: ruby
 authors:
 - palkan
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-01 00:00:00.000000000 Z
+date: 2024-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anyway_config
@@ -24,20 +24,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: google-protobuf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.25'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.25'
+        version: '4'
+- !ruby/object:Gem::Dependency
+  name: stringio
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +128,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +212,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.9.1
 description: AnyCable core RPC implementation not depenending on a particular server
   type (e.g., gRPC or whatever)
 email:
@@ -277,7 +319,7 @@ metadata:
   homepage_uri: https://anycable.io/
   source_code_uri: http://github.com/anycable/anycable
   funding_uri: https://github.com/sponsors/anycable
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -285,15 +327,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
-signing_key:
+rubygems_version: 3.4.19
+signing_key: 
 specification_version: 4
 summary: AnyCable core RPC implementation
 test_files: []