featureflip 2.8.0 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3d59e135c8bde6e1955c965c186ade207bbb58961bbb95ad949497940efbd8d
-  data.tar.gz: 9a25588388685e6e08f206b4ed623b491e949df2fc448797ba4305cdfdedfd4f
+  metadata.gz: 4dfdc2e9de3795a36a917d2a748184853bbd1c30362dd313ac70e386a4d0758c
+  data.tar.gz: e878ef6a553b2948435fc004b905f84015433b42625721d41311c5cb55e87654
 SHA512:
-  metadata.gz: ad445faee786f603e3702df154e78afe5ae8d3ca6868be6c4d5dcc97f03fc4006f364cf40d9c2a73d5e0d43744f5074228186b6b3f69a1a97fd03ca678aa037a
-  data.tar.gz: 5bdd2687ecec69386d9cde9f8b0c5190bd4bee4e49f3187f3762263be21e28e6d3dd09517c4b44451f4ddcc969fa70543a7177f91ba6f2b39fd7a785bf590147
+  metadata.gz: 871ae6a42bfcc7663a805a70935e2ac6b5a746a879df937343239f5f833c00be0990890f0ec47684a1beca0507160439274e26a606ef957510a3aa400d442929
+  data.tar.gz: d793281fb6b00d5cfeb5226c89c035fa17d6fad5d7af1876eac1c7d8c4c1290452c2067b6b9c8106795e4511451e43ef4debc399e660b245b3f7685507c494af

data/lib/featureflip/data_source/streaming.rb

@@ -36,7 +36,7 @@ module Featureflip
       RECONNECT_BASE_DELAY_SECONDS = 1
       MAX_BACKOFF_SECONDS = 30
 
-      def initialize(sdk_key:, config:, http_client:, on_flag_updated:, on_flag_deleted:, on_segment_updated:, on_error:, on_sync: nil, on_give_up: nil)
+      def initialize(sdk_key:, config:, http_client:, on_flag_updated:, on_flag_deleted:, on_segment_updated:, on_error:, on_sync: nil, on_fallback_to_polling: nil, on_recovered: nil)
         @sdk_key = sdk_key
         @config = config
         @http_client = http_client
@@ -45,10 +45,14 @@ module Featureflip
         @on_segment_updated = on_segment_updated
         @on_error = on_error
         @on_sync = on_sync
-        @on_give_up = on_give_up
+        @on_fallback_to_polling = on_fallback_to_polling
+        @on_recovered = on_recovered
         @stop_flag = false
         @thread = nil
         @retry_count = 0
+        # True between arming the polling fallback and the next delivered frame.
+        # Only ever touched from the streaming thread.
+        @fallback_active = false
         @current_event_type = nil
         @current_data = nil
         @line_buffer = String.new # ASCII-8BIT: raw read_body bytes concatenate safely
@@ -60,6 +64,7 @@ module Featureflip
       def start
         @stop_flag = false
         @retry_count = 0
+        @fallback_active = false
         @thread = Thread.new { run }
       end
 
@@ -112,9 +117,14 @@ module Featureflip
             # purposes — otherwise an accept-then-close server never accumulates
             # toward max_stream_retries and never degrades to polling.
             @retry_count += 1
-            if @retry_count > @config.max_stream_retries
-              @on_give_up&.call
-              break
+            # The fallback is ADDITIVE, never terminal (#3071). Polling covers the
+            # outage; this loop keeps retrying the stream underneath at the capped
+            # backoff, and the next delivered frame retires the poller. Breaking out
+            # here left the process polling — and blind to real-time updates — until
+            # it restarted, after only ~31s of unreachability.
+            if @retry_count > @config.max_stream_retries && !@fallback_active
+              @fallback_active = true
+              @on_fallback_to_polling&.call
             end
           end
 
@@ -189,6 +199,14 @@ module Featureflip
           @current_data = @current_data.nil? ? fragment : "#{@current_data}\n#{fragment}"
         elsif line.empty? && @current_event_type && @current_data
           @delivered_frame = true
+          # Retire the fallback poller HERE rather than when run() next comes round:
+          # connect() blocks in read_body for the whole lifetime of a healthy stream,
+          # so a reap on return would leave the poller alive that entire time, and its
+          # periodic whole-store replaces would revert deltas applied by this stream.
+          if @fallback_active
+            @fallback_active = false
+            @on_recovered&.call
+          end
           handle_event(@current_event_type, @current_data)
           @current_event_type = nil
           @current_data = nil

data/lib/featureflip/shared_core.rb

@@ -276,6 +276,11 @@ module Featureflip
       @streaming_handler&.stop
       @polling_handler&.stop
       @event_processor&.stop
+      # Clear both before restarting: start_polling refuses to start a second
+      # poller while one is referenced, so a stopped-but-referenced handler here
+      # would leave a restarted non-streaming core with no data source at all.
+      @streaming_handler = nil
+      @polling_handler = nil
 
       if @config.streaming
         start_streaming
@@ -361,18 +366,35 @@ module Featureflip
         on_segment_updated: ->(flags, segments) { @store.init(flags, segments) },
         on_sync: ->(flags, segments) { @store.init(flags, segments) },
         on_error: ->(_err) { },
-        on_give_up: -> { fallback_to_polling }
+        on_fallback_to_polling: -> { fallback_to_polling },
+        on_recovered: -> { stop_fallback_polling }
       )
       @streaming_handler.start
     end
 
     def fallback_to_polling
-      @config.logger&.warn("Featureflip: streaming retries exhausted, falling back to polling")
-      @streaming_handler = nil
+      @config.logger&.warn(
+        "Featureflip: streaming retries exhausted, falling back to polling while the stream keeps retrying"
+      )
+      # The handler is NOT cleared: it is still running and still trying to reopen
+      # the stream (#3071). Clearing it here is what used to make the fallback
+      # permanent — nothing would have restarted streaming.
       start_polling
     end
 
+    def stop_fallback_polling
+      return if @polling_handler.nil?
+
+      @config.logger&.info("Featureflip: stream recovered, stopping polling fallback")
+      @polling_handler.stop
+      @polling_handler = nil
+    end
+
     def start_polling
+      # Reachable from both start_data_source and the streaming fallback; a second
+      # call must not leak a second polling thread.
+      return if @polling_handler
+
       @polling_handler = DataSource::PollingHandler.new(
         http_client: @http_client,
         config: @config,

data/lib/featureflip/version.rb

@@ -1,3 +1,3 @@
 module Featureflip
-  VERSION = "2.8.0"
+  VERSION = "2.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: featureflip
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.9.0
 platform: ruby
 authors:
 - Featureflip
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-09-08 00:00:00.000000000 Z
+date: 2026-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger