anycable-core 1.4.1 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fead71a088b7431fb65a3cfdd16ebee3760700496e9cc0d440f40b118952ac6a
-  data.tar.gz: 26c7f7d1fd4fa3aefbf8e43358b8eb959e3aa707ec36d2d7775f657748e1afc5
+  metadata.gz: 4a7b2ae33dc506f328c7ce62c3c4c80eabb17ed36ca4826808caeb0534a8b2ab
+  data.tar.gz: 2cfae2f0b55718269c33dfc5877d55a2d210d9fa99f0aca85c2899720c0cf350
 SHA512:
-  metadata.gz: 887068bded37ce33ebdb0a5ae2ffce3afbb545053a544db83ad581008ac0ec603a45019df8a87281030b790db90f2aae3c812b3434b3c782ac69f29d04c535bd
-  data.tar.gz: c2e49c2fc7becb3c9b9076fd57f988abec053bd419e56dd0769d4e086704a66fd80dab0ffa485a9221053b9742a55de38c90b1463d1d5264b385c7b2f132d33d
+  metadata.gz: b10e485726fd3f48791883af759cfdbeb963a59798a3df7a5100e993891fdb8faff370d028f6b81010be79b2737405196e7f4988041c92896326b222eab4296a
+  data.tar.gz: a901c3958ed1d866a6d7d7f20fb7e8ede84bfabbba29136a022e8eaf3241d10aa437d02c163fa54d0fe7aad8fef701df2299968a20fc887b9348276bee11098a

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ## master
 
+## 1.4.3 (2023-10-15)
+
+- Add broadcast options support. ([@palkan][])
+
+- Add batch-broadcasting support. ([@palkan][])
+
+## 1.4.2 (2023-09-05)
+
+- Fix parsing sentinel configuration from YAML in Rails. ([@palkan][])
+
 ## 1.4.1 (2023-07-24)
 
 - Add TLS support for gRPC server. ([@Envek][])

data/lib/anycable/broadcast_adapters/base.rb

@@ -7,8 +7,31 @@ module AnyCable
         raise NotImplementedError
       end
 
-      def broadcast(stream, payload)
-        raw_broadcast({stream: stream, data: payload}.to_json)
+      def batching(enabled = true)
+        self.batching_enabled = enabled
+        yield
+      ensure
+        maybe_flush_batch
+      end
+
+      def start_batching
+        self.batching_enabled = true
+      end
+
+      def finish_batching
+        maybe_flush_batch
+      end
+
+      def batching?
+        Thread.current[:anycable_batching]&.last
+      end
+
+      def broadcast(stream, payload, options = nil)
+        if batching?
+          current_batch << {stream: stream, data: payload, meta: options}.compact
+        else
+          raw_broadcast({stream: stream, data: payload, meta: options}.compact.to_json)
+        end
       end
 
       def broadcast_command(command, **payload)
@@ -21,6 +44,32 @@ module AnyCable
 
       private
 
+      def batching_enabled=(val)
+        # The stack must start with the true value,
+        # so we can check for emptiness to decide whether to flush
+        stack = batching_enabled_stack
+        stack << val if val || !stack.empty?
+      end
+
+      def batching_enabled_stack
+        Thread.current[:anycable_batching] ||= []
+      end
+
+      def current_batch
+        Thread.current[:anycable_batch] ||= []
+      end
+
+      def maybe_flush_batch
+        batching_enabled_stack.pop
+        return unless batching_enabled_stack.empty?
+
+        batch = current_batch
+        unless batch.empty?
+          raw_broadcast(batch.to_json)
+        end
+        current_batch.clear
+      end
+
       def logger
         AnyCable.logger
       end

data/lib/anycable/config.rb

@@ -171,7 +171,7 @@ module AnyCable
     private
 
     def parse_sentinel(sentinel)
-      return sentinel.transform_keys!(&:to_sym) if sentinel.is_a?(Hash)
+      return sentinel.to_hash.transform_keys(&:to_sym) if sentinel.respond_to?(:to_hash)
 
       uri = URI.parse("redis://#{sentinel}")
 

data/lib/anycable/grpc_kit/server.rb

@@ -2,9 +2,9 @@
 
 require "anycable/grpc/handler"
 
-require_relative "./health_pb"
-require_relative "./health_services_pb"
-require_relative "./health_checker"
+require_relative "health_pb"
+require_relative "health_services_pb"
+require_relative "health_checker"
 
 module AnyCable
   module GRPC

data/lib/anycable/version.rb

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

data/lib/anycable.rb

@@ -92,8 +92,8 @@ module AnyCable
 
     # Raw broadcast message to the channel, sends only string!
     # To send hash or object use ActionCable.server.broadcast instead!
-    def broadcast(channel, payload)
-      broadcast_adapter.broadcast(channel, payload)
+    def broadcast(...)
+      broadcast_adapter.broadcast(...)
     end
 
     def rpc_handler

data/sig/anycable/broadcast_adapters/base.rbs

@@ -1,7 +1,13 @@
 module AnyCable
+  type broadcastOptions = {exclude_socket: String}
+
   interface _BroadcastAdapter
     def raw_broadcast: (String _data) -> void
-    def broadcast: (String stream, String payload) -> void
+    def batching: (?bool enabled) { () -> untyped } -> untyped
+    def start_batching: () -> void
+    def finish_batching: () -> void
+    def batching?: () -> (bool | NilClass)
+    def broadcast: (String stream, String payload, ?broadcastOptions options) -> void
     def broadcast_command: (String command, **untyped payload) -> void
     def announce!: () -> void
   end
@@ -13,6 +19,10 @@ module AnyCable
       private
 
       def logger: () -> Logger
+      def current_batch: () -> Array[untyped]
+      def maybe_flush_batch: () -> void
+      def batching_enabled_stack: () -> Array[bool]
+      def batching_enabled=: (bool) -> void
     end
   end
 end

data/sig/anycable/config.rbs

@@ -68,7 +68,7 @@ module AnyCable
 
     private
 
-    def parse_sentinel: ((String | Hash[untyped, untyped]) sentinel) -> Hash[Symbol, untyped]
+    def parse_sentinel: (untyped sentinel) -> Hash[Symbol, untyped]
     def load_presets: () -> void
     def detect_presets: () -> Array[String]
     def write_preset: (Symbol, untyped, preset: String) -> void

data/sig/anycable.rbs

@@ -36,6 +36,6 @@ module AnyCable
   def self.server_callbacks: () -> Array[^() -> void]
   def self.broadcast_adapter: () -> _BroadcastAdapter
   def self.broadcast_adapter=: (untyped adapter) -> void
-  def self.broadcast: (String channel, String payload) -> void
+  def self.broadcast: (String channel, String payload, ?broadcastOptions options) -> void
   def self.rpc_handler: () -> RPC::Handler
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anycable-core
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.3
 platform: ruby
 authors:
 - palkan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-25 00:00:00.000000000 Z
+date: 2023-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anyway_config