Deduplicate channels and groups in request building (#173)

parfeon · web-flow · commit e45d2cc7e274 · 2026-03-03T11:17:38.000+02:00
feat(subscribe): deduplicate channels and groups in request building

Add `.uniq` calls when building subscribe URL path and channel-group query parameter to prevent duplicate
channels and channel groups from leaking into HTTP requests.

feat(heartbeat): deduplicate channels and groups in request building

Add `.uniq` calls when building heartbeat URL path and channel-group query parameter to prevent duplicate
channels and channel groups from leaking into HTTP requests.
diff --git a/.pubnub.yml b/.pubnub.yml
@@ -1,6 +1,13 @@
 ---
-version: "6.0.1"
+version: "6.0.2"
 changelog:
+  - date: 2026-03-03
+    version: v6.0.2
+    changes:
+      - type: improvement
+        text: "Add `.uniq` calls when building subscribe URL path and channel-group query parameter to prevent duplicate channels and channel groups from leaking into HTTP requests."
+      - type: improvement
+        text: "Add `.uniq` calls when building heartbeat URL path and channel-group query parameter to prevent duplicate channels and channel groups from leaking into HTTP requests."
   - date: 2025-11-04
     version: v6.0.1
     changes:
@@ -627,7 +634,7 @@ sdks:
                     - x86-64
           - distribution-type: package
             distribution-repository: RubyGems
-            package-name: pubnub-6.0.1.gem
+            package-name: pubnub-6.0.2.gem
             location: https://rubygems.org/gems/pubnub
             requires:
               - name: addressable
@@ -732,8 +739,8 @@ sdks:
                     - x86-64
           - distribution-type: library
             distribution-repository: GitHub release
-            package-name: pubnub-6.0.1.gem
-            location: https://github.com/pubnub/ruby/releases/download/v6.0.1/pubnub-6.0.1.gem
+            package-name: pubnub-6.0.2.gem
+            location: https://github.com/pubnub/ruby/releases/download/v6.0.2/pubnub-6.0.2.gem
             requires:
               - name: addressable
                 min-version: 2.0.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,38 +1,45 @@
-## v6.0.1
-November 04 2025
-
-#### Fixed
-- Send proper object for `state` with the `heartbeat` request.
-
-#### Modified
-- Don't cap `limit` and let the server perform value validation.
-- Replace legacy timetoken query parameter with subscribe v2 parameters.
-
-## v6.0.0
-October 15 2025
-
-#### Added
-- BREAKING CHANGES: Add 'limit' and 'offset' parameters for 'here_now' for pagination support.
-
-## v5.6.0
-September 11 2025
-
-#### Added
-- Add the `encode_channels` parameter for `fetch` to enable or disable channel names percent-encoding in response.
-
-## v5.5.1
-September 08 2025
-
-#### Fixed
-- Fix the issue introduced by RuboCop linter suggestion acceptance, which caused a wrong number of arguments error.
-
-## v5.5.0
-January 28 2025
-
-#### Added
-- Add the ability to specify `type` and `status` fields for `channel metadata`, `uuid metadata`, `member`, and `membership`.
-- Add missing `include` options for App Context APIs: `custom`, `status`, `type`, `uuid_status`, `uuid_type`, `channel_status`, and `channel_type`.
-
+## v6.0.2
+March 03 2026
+
+#### Modified
+- Add `.uniq` calls when building subscribe URL path and channel-group query parameter to prevent duplicate channels and channel groups from leaking into HTTP requests.
+- Add `.uniq` calls when building heartbeat URL path and channel-group query parameter to prevent duplicate channels and channel groups from leaking into HTTP requests.
+
+## v6.0.1
+November 04 2025
+
+#### Fixed
+- Send proper object for `state` with the `heartbeat` request.
+
+#### Modified
+- Don't cap `limit` and let the server perform value validation.
+- Replace legacy timetoken query parameter with subscribe v2 parameters.
+
+## v6.0.0
+October 15 2025
+
+#### Added
+- BREAKING CHANGES: Add 'limit' and 'offset' parameters for 'here_now' for pagination support.
+
+## v5.6.0
+September 11 2025
+
+#### Added
+- Add the `encode_channels` parameter for `fetch` to enable or disable channel names percent-encoding in response.
+
+## v5.5.1
+September 08 2025
+
+#### Fixed
+- Fix the issue introduced by RuboCop linter suggestion acceptance, which caused a wrong number of arguments error.
+
+## v5.5.0
+January 28 2025
+
+#### Added
+- Add the ability to specify `type` and `status` fields for `channel metadata`, `uuid metadata`, `member`, and `membership`.
+- Add missing `include` options for App Context APIs: `custom`, `status`, `type`, `uuid_status`, `uuid_type`, `channel_status`, and `channel_type`.
+
 ## v5.4.0
 January 07 2025
 
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pubnub (6.0.1)
+    pubnub (6.0.2)
       addressable (>= 2.0.0)
       concurrent-ruby (~> 1.3.4)
       concurrent-ruby-edge (~> 0.7.1)
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-6.0.1
+6.0.2
diff --git a/fixtures/vcr_cassettes/examples/presence/0.yml b/fixtures/vcr_cassettes/examples/presence/0.yml
diff --git a/fixtures/vcr_cassettes/examples/presence/1.yml b/fixtures/vcr_cassettes/examples/presence/1.yml
diff --git a/fixtures/vcr_cassettes/examples/presence/2.yml b/fixtures/vcr_cassettes/examples/presence/2.yml
diff --git a/fixtures/vcr_cassettes/lib/events/heartbeat-unique.yml b/fixtures/vcr_cassettes/lib/events/heartbeat-unique.yml
diff --git a/lib/pubnub/events/heartbeat.rb b/lib/pubnub/events/heartbeat.rb
@@ -25,7 +25,7 @@ def path
         'sub-key',
         @subscribe_key,
         'channel',
-        Formatter.channels_for_url(@channel),
+        Formatter.channels_for_url(@channel.uniq),
         'heartbeat'
       ].join('/')
     end
@@ -37,7 +37,7 @@ def parameters(*_args)
         parameters.delete(:state) if parameters[:state] == '%7B%7D'
       end
       parameters[:heartbeat] = @heartbeat
-      parameters['channel-group'] = @group.join(',') unless @group.blank?
+      parameters['channel-group'] = @group.uniq.join(',') unless @group.blank?
       parameters
     end
 
diff --git a/lib/pubnub/subscribe_event.rb b/lib/pubnub/subscribe_event.rb
@@ -124,7 +124,7 @@ def path
         'v2',
         'subscribe',
         @subscribe_key,
-        Pubnub::Formatter.channels_for_url(@channel + @wildcard_channel),
+        Pubnub::Formatter.channels_for_url((@channel + @wildcard_channel).uniq),
         0
       ].join('/').gsub(/\?/, '%3F')
     end
@@ -151,7 +151,7 @@ def add_timetoken_to_params(params)
     end
 
     def add_group_to_params(params)
-      params['channel-group'] = @group.join(',') unless @group.empty?
+      params['channel-group'] = @group.uniq.join(',') unless @group.empty?
       params
     end
 
diff --git a/lib/pubnub/version.rb b/lib/pubnub/version.rb
@@ -1,4 +1,4 @@
 # Toplevel Pubnub module.
 module Pubnub
-  VERSION = '6.0.1'.freeze
+  VERSION = '6.0.2'.freeze
 end
diff --git a/spec/lib/events/heartbeat_spec.rb b/spec/lib/events/heartbeat_spec.rb
@@ -42,6 +42,19 @@
       end
     end
 
+    it "sends unique channels and channel groups even when duplicates are provided" do
+      VCR.use_cassette("lib/events/heartbeat-unique", record: :once) do
+        envelope = @pubnub.heartbeat(
+          channel: ['demo', 'demo', 'demo-b'],
+          channel_group: ['grp-a', 'grp-a'],
+        ).value
+
+        expect(envelope.status[:client_request].to_s).to include('/channel/demo,demo-b/')
+        expect(envelope.status[:client_request].to_s).to include('channel-group=grp-a')
+        expect(envelope.status[:client_request].to_s).not_to include('channel-group=grp-a,grp-a')
+      end
+    end
+
     it "forms valid ErrorEnvelope on error" do
       VCR.use_cassette("lib/events/heartbeat-error", record: :once) do
         envelope = @pubnub.heartbeat(
