ask-web-fetch 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08275e5b901ca9aaba313cac4cd3f776efb2c16b93aa709645c0ad367a1ff720'
-  data.tar.gz: 0eaba632b36081a0bc3fbf7dd1ff2b463cadb613e44d8a280d0546aeeda40676
+  metadata.gz: d3e0494d6f9fd54b7b80b667b97d57f17d1b0e871d44c26fada9ad91669a391d
+  data.tar.gz: e06918a4ca162ee2111715530f67ab68c8feae529c27c180cebb0cf462f13867
 SHA512:
-  metadata.gz: 3c82f4b9abfb154fb06b9a5feaaf2254ddb6caa1cac99892a034311b4113ab1775114ad7c5aa126db88682c3ecf4cdfbee13786b61a06a00f2f30d6b838a2cdf
-  data.tar.gz: f3d14810e581699b5d2f8717fa329052ad8b81f03611d637d99fde979f1b324d2939ee79217ee812018327596f07ae0659c987b2e42f197df60af4bff30c8a7b
+  metadata.gz: 4a045bb9226bb302cd60bda942acfa05a00e1f3d1aced99edc3bbd77a061c7650580b40447c385a4777b7156fa81aa0fcc57267caa4385b478e4d005c015f41f
+  data.tar.gz: ffab19b64968c909c67dd631902b447738248c7e6a0d3da5db8851cc2ff615ec627bc8a89407b40dbeabbebb591d2cd6726c21747de34962cc9ff77c98ce16e8

data/lib/ask/web_fetch/backends/attached_browser.rb

@@ -27,7 +27,11 @@ module Ask
 
         # Creates a page as a fresh tab in the attached browser.
         def create_page
-          Page.new(client, timeout: @timeout)
+          # Capture the frontmost app once per browser instance, not per
+          # page: a batch of fetches steals focus once and restores to the
+          # same app, and consecutive fetches don't fight each other.
+          @frontmost_app ||= FocusRestorer.capture_frontmost
+          Page.new(client, timeout: @timeout, restore_focus_to: @frontmost_app)
         end
 
         private
@@ -43,9 +47,10 @@ module Ask
         # enough CDP for the Browser backend: navigate, read title/URL/HTML,
         # and report the main-document HTTP status.
         class Page
-          def initialize(client, timeout:)
+          def initialize(client, timeout:, restore_focus_to: nil)
             @client = client
             @timeout = timeout
+            @restore_focus_to = restore_focus_to
             @target_id = @client.command('Target.createTarget', url: 'about:blank')['targetId']
             @session = @client.session(
               @client.command('Target.attachToTarget', targetId: @target_id, flatten: true)['sessionId']
@@ -91,6 +96,12 @@ module Ask
             @client.command('Target.closeTarget', targetId: @target_id)
           rescue Ferrum::Error
             nil
+          ensure
+            # The attached dev Chrome window steals focus when a tab is
+            # created; give it back once the tab is gone — but only to an
+            # app that ISN'T Chrome, so a fetch while the user is already
+            # looking at Chrome doesn't ping-pong.
+            FocusRestorer.restore_frontmost(@restore_focus_to)
           end
 
           def evaluate(expression)
@@ -189,6 +200,48 @@ module Ask
           end
         end
       end
+
+      # macOS dev convenience: the attached Chrome window steals focus when
+      # a tab is created, and a developer working in another app wants it
+      # back once the tab is closed. Captures the frontmost app before the
+      # page is created and re-activates it after close. Deliberately
+      # cheap and quiet: one osascript each way, rescued to nil everywhere
+      # else (prod is headless Linux — this module is a no-op there, and
+      # even on macOS a failure must never fail a fetch).
+      module FocusRestorer
+        # The command runner, injectable for tests (minitest 6 ships no
+        # mock support, so tests swap this instead of stubbing).
+        class << self
+          attr_writer :runner
+
+          def runner
+            @runner ||= method(:system)
+          end
+        end
+
+        def self.capture_frontmost
+          return nil unless RUBY_PLATFORM.include?('darwin')
+
+          out = `osascript -e 'tell application "System Events" to get name of first application process whose frontmost is true' 2>/dev/null`.strip
+          out.empty? ? nil : out
+        rescue StandardError
+          nil
+        end
+
+        def self.restore_frontmost(app)
+          return if app.nil? || app.empty?
+
+          # Never ping-pong: if the user is already looking at Chrome (or
+          # headless/CI has no frontmost app at all), there's nothing to
+          # give back.
+          return if app == 'Google Chrome'
+
+          runner.call("osascript -e 'tell application \"#{app}\" to activate' 2>/dev/null")
+          nil
+        rescue StandardError
+          nil
+        end
+      end
     end
   end
 end

data/lib/ask/web_fetch/version.rb

@@ -2,6 +2,6 @@
 
 module Ask
   module WebFetch
-    VERSION = '0.5.7'
+    VERSION = '0.5.8'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ask-web-fetch
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors:
 - Kaka Ruto