faye-redis-ng 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 699f1995764ed2a5634956a06c84b89daf6b68bdfa54f7f0c0f44d9cbd4f3e03
-  data.tar.gz: 6fe62df2b60a0d2d43cd001c93147e95f4a19355db7b1ebb3437b1c9ab567ae1
+  metadata.gz: d0fea6c56f6598af371ca22722f24899d5aab97ca4a73f52ae3e8a12e28ea20c
+  data.tar.gz: 5291d2eb437e9241211c6e8784ee582ad4f792be01ab628ee618f16f85d84c49
 SHA512:
-  metadata.gz: 47807e29747264e5bf6847fbe177f4e9a83cb7e7e75b0d0f297b2580579252d81e13588a93daa0efae3b02b4cb30bd91e97f59c63c4f1420dc0f2b9ad1e3a45d
-  data.tar.gz: 8a3110fdf417cc65b2a0fe98eb57423a5eeffe1e6df7e867a206ee14a71f7b990e4b06aad2a5c5c6c16d028455d5138df17086a04ab3b8f9388ed8af0da0b3f9
+  metadata.gz: d22bd343a33dabb655b365dedc1a74bf6b1040604be2b3bd6391309cf6581bc3f0bd17762630ece5fe80f93fb590e653a65b85ba8fa71f09214d8226199ec5bb
+  data.tar.gz: 3749cc0435c68f903f401e8598e9952aaa3710b43ef54873b5b9b50e6d229df6253dac88119112dc7f32f2f9c14a1dc7a65061548b202b58fda252d61ffe309d

data/CHANGELOG.md

@@ -7,6 +7,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.0.3] - 2025-10-06
+
+### Fixed
+- **Memory Leak**: Fixed `MessageQueue.clear` to properly delete message data instead of only clearing queue index
+- **Resource Cleanup**: Fixed `destroy_client` to clear message queue before destroying client
+- **Race Condition**: Fixed `publish` callback timing to wait for all async operations to complete
+- **Pattern Cleanup**: Fixed `SubscriptionManager` to properly clean up wildcard patterns when last subscriber unsubscribes
+- **Thread Safety**: Fixed `PubSubCoordinator` to use array duplication when iterating subscribers to prevent concurrent modification
+
+### Changed
+- **Performance**: Optimized `cleanup_expired` to use batch pipelined operations instead of individual checks
+  - Reduces Redis calls from O(n²) to O(n) for n clients
+  - Returns count of cleaned clients via callback
+
+### Improved
+- **Test Coverage**: Increased line coverage from 90% to 95.83% (528/551 lines)
+- Added comprehensive tests for cleanup operations and wildcard pattern management
+
 ## [1.0.2] - 2025-10-06
 
 ### Fixed
@@ -47,7 +65,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Security
 - Client and message IDs now use `SecureRandom.uuid` instead of predictable time-based generation
 
-[Unreleased]: https://github.com/7a6163/faye-redis-ng/compare/v1.0.2...HEAD
+[Unreleased]: https://github.com/7a6163/faye-redis-ng/compare/v1.0.3...HEAD
+[1.0.3]: https://github.com/7a6163/faye-redis-ng/compare/v1.0.2...v1.0.3
 [1.0.2]: https://github.com/7a6163/faye-redis-ng/compare/v1.0.1...v1.0.2
 [1.0.1]: https://github.com/7a6163/faye-redis-ng/compare/v1.0.0...v1.0.1
 [1.0.0]: https://github.com/7a6163/faye-redis-ng/releases/tag/v1.0.0

data/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 faye-redis-ng
+Copyright (c) 2025 faye-redis-ng
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -268,4 +268,4 @@ MIT License - see LICENSE file for details
 ## Acknowledgments
 
 - Built for the [Faye](https://faye.jcoglan.com/) messaging system
-- Inspired by the original faye-redis gem
+- Inspired by the original [faye-redis](https://github.com/faye/faye-redis-ruby) gem

data/lib/faye/redis/client_registry.rb

@@ -110,14 +110,43 @@ module Faye
       end
 
       # Clean up expired clients
-      def cleanup_expired
+      def cleanup_expired(&callback)
         all do |client_ids|
-          client_ids.each do |client_id|
-            exists?(client_id) do |exists|
-              destroy(client_id) unless exists
+          # Check existence in batch using pipelined commands
+          results = @connection.with_redis do |redis|
+            redis.pipelined do |pipeline|
+              client_ids.each do |client_id|
+                pipeline.exists?(client_key(client_id))
+              end
             end
           end
+
+          # Collect expired client IDs
+          expired_clients = []
+          client_ids.each_with_index do |client_id, index|
+            result = results[index]
+            # Redis 5.x returns boolean, older versions return integer
+            exists = result.is_a?(Integer) ? result > 0 : result
+            expired_clients << client_id unless exists
+          end
+
+          # Batch delete expired clients
+          if expired_clients.any?
+            @connection.with_redis do |redis|
+              redis.pipelined do |pipeline|
+                expired_clients.each do |client_id|
+                  pipeline.del(client_key(client_id))
+                  pipeline.srem?(clients_index_key, client_id)
+                end
+              end
+            end
+          end
+
+          EventMachine.next_tick { callback.call(expired_clients.size) } if callback
         end
+      rescue => e
+        log_error("Failed to cleanup expired clients: #{e.message}")
+        EventMachine.next_tick { callback.call(0) } if callback
       end
 
       private

data/lib/faye/redis/message_queue.rb

@@ -138,8 +138,19 @@ module Faye
 
       # Clear a client's message queue
       def clear(client_id, &callback)
+        # Get all message IDs first
+        message_ids = @connection.with_redis do |redis|
+          redis.lrange(queue_key(client_id), 0, -1)
+        end
+
+        # Delete queue and all message data
         @connection.with_redis do |redis|
-          redis.del(queue_key(client_id))
+          redis.pipelined do |pipeline|
+            pipeline.del(queue_key(client_id))
+            message_ids.each do |message_id|
+              pipeline.del(message_key(message_id))
+            end
+          end
         end
 
         EventMachine.next_tick { callback.call(true) } if callback

data/lib/faye/redis/pubsub_coordinator.rb

@@ -166,9 +166,9 @@ module Faye
         begin
           message = JSON.parse(message_json)
 
-          # Notify all subscribers
+          # Notify all subscribers (use dup to avoid concurrent modification)
           EventMachine.next_tick do
-            @subscribers.each do |subscriber|
+            @subscribers.dup.each do |subscriber|
               subscriber.call(channel, message)
             end
           end

data/lib/faye/redis/subscription_manager.rb

@@ -56,6 +56,11 @@ module Faye
           end
         end
 
+        # Clean up wildcard pattern if no more subscribers
+        if channel.include?('*')
+          cleanup_pattern_if_unused(channel)
+        end
+
         EventMachine.next_tick { callback.call(true) } if callback
       rescue => e
         log_error("Failed to unsubscribe client #{client_id} from #{channel}: #{e.message}")
@@ -160,6 +165,20 @@ module Faye
 
       private
 
+      def cleanup_pattern_if_unused(pattern)
+        subscribers = @connection.with_redis do |redis|
+          redis.smembers(channel_subscribers_key(pattern))
+        end
+
+        if subscribers.empty?
+          @connection.with_redis do |redis|
+            redis.srem(patterns_key, pattern)
+          end
+        end
+      rescue => e
+        log_error("Failed to cleanup pattern #{pattern}: #{e.message}")
+      end
+
       def client_subscriptions_key(client_id)
         namespace_key("subscriptions:#{client_id}")
       end

data/lib/faye/redis/version.rb

@@ -1,5 +1,5 @@
 module Faye
   class Redis
-    VERSION = '1.0.2'
+    VERSION = '1.0.3'
   end
 end

data/lib/faye/redis.rb

@@ -66,7 +66,9 @@ module Faye
     # Destroy a client
     def destroy_client(client_id, &callback)
       @subscription_manager.unsubscribe_all(client_id) do
-        @client_registry.destroy(client_id, &callback)
+        @message_queue.clear(client_id) do
+          @client_registry.destroy(client_id, &callback)
+        end
       end
     end
 
@@ -93,26 +95,49 @@ module Faye
     # Publish a message to channels
     def publish(message, channels, &callback)
       channels = [channels] unless channels.is_a?(Array)
-      success = true
 
       begin
+        remaining_operations = channels.size
+        success = true
+
         channels.each do |channel|
           # Store message in queues for subscribed clients
           @subscription_manager.get_subscribers(channel) do |client_ids|
-            client_ids.each do |client_id|
-              @message_queue.enqueue(client_id, message) do |enqueued|
-                success &&= enqueued
+            enqueue_count = client_ids.size
+
+            if enqueue_count == 0
+              # No clients to enqueue, just do pub/sub
+              @pubsub_coordinator.publish(channel, message) do |published|
+                success &&= published
+                remaining_operations -= 1
+
+                if remaining_operations == 0 && callback
+                  EventMachine.next_tick { callback.call(success) }
+                end
+              end
+            else
+              # Enqueue for all subscribed clients
+              client_ids.each do |client_id|
+                @message_queue.enqueue(client_id, message) do |enqueued|
+                  success &&= enqueued
+                  enqueue_count -= 1
+
+                  # When all enqueues are done, do pub/sub
+                  if enqueue_count == 0
+                    @pubsub_coordinator.publish(channel, message) do |published|
+                      success &&= published
+                      remaining_operations -= 1
+
+                      if remaining_operations == 0 && callback
+                        EventMachine.next_tick { callback.call(success) }
+                      end
+                    end
+                  end
+                end
               end
             end
           end
-
-          # Publish to Redis pub/sub for cross-server routing
-          @pubsub_coordinator.publish(channel, message) do |published|
-            success &&= published
-          end
         end
-
-        EventMachine.next_tick { callback.call(success) } if callback
       rescue => e
         log_error("Failed to publish message to channels #{channels}: #{e.message}")
         EventMachine.next_tick { callback.call(false) } if callback

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faye-redis-ng
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Zac