tempest-rb 0.1.0 → 0.1.2

data/lib/tempest/repl/runner.rb

@@ -18,6 +18,7 @@ module Tempest
           :timeline       Fetch and print the home timeline
           :stream on|off  Toggle the Jetstream live feed
           :open $LX       Open the URL with id $LX in the browser
+          :relogin        Re-authenticate when the cached session is dead
           :help           Show this help
           :quit           Exit tempest (or Ctrl-D)
 
@@ -28,10 +29,12 @@ module Tempest
 
       DEFAULT_OPENER = ->(url) { system("open", url) }
 
+      RELOGIN_HINT = "type :relogin to re-authenticate".freeze
+
       def initialize(session:, client:, input:, output:, dispatcher: Dispatcher.new,
                      stream_manager: nil, handle_resolver: nil, stream_output: nil,
                      timeline_store: nil, registry: Registry.new, opener: DEFAULT_OPENER,
-                     avatar_store: nil)
+                     avatar_store: nil, reauth: nil)
         @session = session
         @client = client
         @input = input
@@ -44,6 +47,7 @@ module Tempest
         @registry = registry
         @opener = opener
         @avatar_store = avatar_store
+        @reauth = reauth
         # URIs already printed via bootstrap_timeline or backfill_timeline.
         # Jetstream's cursor-replay can re-emit those same posts on startup
         # (the persisted cursor is older than the getTimeline window), so the
@@ -104,6 +108,8 @@ module Tempest
             handle_reply(command.args[0], command.args[1])
           when :open
             handle_open(command.args.first)
+          when :relogin
+            handle_relogin
           when :unknown
             @output.puts "unknown command: :#{command.args.first}"
           end
@@ -133,10 +139,25 @@ module Tempest
       def handle_post(text)
         response = Post.create(@client, did: @session.did, text: text)
         @output.puts "posted: #{response["uri"]}"
+      rescue Tempest::AuthenticationError => e
+        @output.puts "error: #{e.message} (#{RELOGIN_HINT})"
       rescue Tempest::Error => e
         @output.puts "error: #{e.message}"
       end
 
+      def handle_relogin
+        if @reauth.nil?
+          @output.puts "relogin is not available in this session"
+          return
+        end
+
+        new_session = @reauth.call
+        @session.replace_with!(new_session)
+        @output.puts "signed in as @#{@session.handle}"
+      rescue Tempest::Error => e
+        @output.puts "relogin failed: #{e.message}"
+      end
+
       def handle_reply(var, body)
         target = @registry.find_post(var)
         if target.nil?
@@ -155,6 +176,8 @@ module Tempest
           reply: { uri: reply_uri_for(target), cid: target.cid },
         )
         @output.puts "posted: #{response["uri"]}"
+      rescue Tempest::AuthenticationError => e
+        @output.puts "error: #{e.message} (#{RELOGIN_HINT})"
       rescue Tempest::Error => e
         @output.puts "error: #{e.message}"
       end

data/lib/tempest/repl/screen.rb

@@ -20,6 +20,7 @@ module Tempest
         @cols = cols
         @enabled = false
         @mutex = Mutex.new
+        @pending_resize = nil
       end
 
       def enable
@@ -33,10 +34,13 @@ module Tempest
         @io.print "\e[#{rows};1H"        # park cursor on the final row (prompt)
         @io.flush if @io.respond_to?(:flush)
         @enabled = true
+        install_resize_trap
       end
 
       def disable
         return unless @enabled
+        uninstall_resize_trap
+        @io.print "\e_Ga=d,q=2\e\\"
         @io.print "\e[r"
         @io.flush if @io.respond_to?(:flush)
         @enabled = false
@@ -46,8 +50,18 @@ module Tempest
         @enabled
       end
 
+      # SIGWINCH hook. Trap handlers in Ruby are restricted (can't reliably
+      # acquire mutexes or drive Reline), so we only stash the new dimensions
+      # here and apply them on the next mutex-protected write. If rows/cols
+      # are omitted (the production path), they're read from IO.console at
+      # apply time so coalesced WINCHes still pick up the latest size.
+      def notify_resize(rows: nil, cols: nil)
+        @pending_resize = { rows: rows, cols: cols }
+      end
+
       def puts(*lines)
         @mutex.synchronize do
+          apply_pending_resize
           if @enabled
             flat = lines.empty? ? [""] : lines.flat_map { |l| l.to_s.split("\n") }
             flat.each { |line| insert_above_prompt(line) }
@@ -91,6 +105,50 @@ module Tempest
 
       private
 
+      # Caller must hold @mutex. Re-issues DECSTBM and re-parks the cursor on
+      # the new prompt row when winsize actually changed; cheap no-op when it
+      # didn't (some terminals send spurious WINCHes on focus changes).
+      def apply_pending_resize
+        pending = @pending_resize
+        return unless pending
+        @pending_resize = nil
+
+        new_rows = pending[:rows] || detect_rows
+        new_cols = pending[:cols] || detect_cols
+        return unless new_rows && new_rows >= 4
+        return if new_rows == @rows && new_cols == @cols
+
+        @rows = new_rows
+        @cols = new_cols
+        return unless @enabled
+
+        @io.print "\e[1;#{@rows - 1}r"
+        @io.print "\e[#{@rows};1H"
+        @io.flush if @io.respond_to?(:flush)
+      end
+
+      # Install a SIGWINCH trap that only flips a flag. Ruby's trap context
+      # forbids most blocking work (mutexes, IO that might re-enter Reline),
+      # so the actual DECSTBM reissue happens later when puts/print pick up
+      # the pending resize. The previous handler is saved so disable can
+      # restore it cleanly.
+      def install_resize_trap
+        return unless Signal.list.key?("WINCH")
+        screen = self
+        @previous_winch_trap = Signal.trap("WINCH") { screen.notify_resize }
+      rescue ArgumentError
+        # Some embedded Rubies refuse to trap WINCH; nothing to do.
+        @previous_winch_trap = nil
+      end
+
+      def uninstall_resize_trap
+        return unless Signal.list.key?("WINCH")
+        Signal.trap("WINCH", @previous_winch_trap || "DEFAULT")
+        @previous_winch_trap = nil
+      rescue ArgumentError
+        @previous_winch_trap = nil
+      end
+
       def detect_rows
         return nil unless defined?(IO) && IO.respond_to?(:console)
         console = IO.console
@@ -130,6 +188,7 @@ module Tempest
 
       def wrap_to_cols(line)
         return [line] unless @cols && @cols.positive?
+        return [line] if line.include?("\e_G")
         return [line] if Reline::Unicode.calculate_width(line, true) <= @cols
 
         chunks, _ = Reline::Unicode.split_by_width(line, @cols)

data/lib/tempest/session.rb

@@ -46,6 +46,7 @@ module Tempest
       @handle = handle
       @pds_host = pds_host
       @identifier = identifier
+      @refresh_mutex = Mutex.new
     end
 
     def access_expired?
@@ -54,7 +55,40 @@ module Tempest
       Time.now.to_i + EXPIRY_LEEWAY_SECONDS >= exp
     end
 
-    def refresh!
+    # Adopts another Session's credentials in place. Used by :relogin so the
+    # XRPCClient that already holds a reference to this Session keeps working
+    # without having to be reconstructed.
+    def replace_with!(other)
+      @refresh_mutex.synchronize do
+        @access_jwt = other.access_jwt
+        @refresh_jwt = other.refresh_jwt
+        @did = other.did
+        @handle = other.handle
+        @pds_host = other.pds_host
+      end
+      @on_change&.call(self)
+      self
+    end
+
+    # Refreshes the session using the current refresh_jwt.
+    #
+    # When `if_unchanged_from:` is supplied, the refresh is skipped if the
+    # session's access_jwt has already moved past that value. Combined with the
+    # internal mutex, this lets concurrent callers coalesce a single
+    # refreshSession round-trip: the first caller refreshes while the rest wait
+    # for the lock and then observe the new token, no-op'ing instead of issuing
+    # duplicate refresh requests.
+    def refresh!(if_unchanged_from: nil)
+      @refresh_mutex.synchronize do
+        return self if if_unchanged_from && @access_jwt != if_unchanged_from
+
+        perform_refresh
+      end
+    end
+
+    private
+
+    def perform_refresh
       url = "#{@pds_host}/xrpc/com.atproto.server.refreshSession"
       response = Tempest::HTTP.post_json(
         url,
@@ -77,8 +111,6 @@ module Tempest
       self
     end
 
-    private
-
     def jwt_exp(token)
       _, payload, _ = token.split(".")
       return nil if payload.nil?

data/lib/tempest/version.rb

@@ -1,3 +1,3 @@
 module Tempest
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

data/lib/tempest/xrpc_client.rb

@@ -38,10 +38,11 @@ module Tempest
     end
 
     def perform
-      response = yield(@session.access_jwt)
+      attempted_jwt = @session.access_jwt
+      response = yield(attempted_jwt)
 
-      if response.unauthorized?
-        @session.refresh!
+      if auth_expired_response?(response)
+        @session.refresh!(if_unchanged_from: attempted_jwt)
         response = yield(@session.access_jwt)
       end
 
@@ -49,5 +50,13 @@ module Tempest
 
       response.body
     end
+
+    def auth_expired_response?(response)
+      return true if response.unauthorized?
+      return false unless response.status == 400
+      return false unless response.body.is_a?(Hash)
+
+      response.body["error"] == "ExpiredToken"
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tempest-rb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Yuya Fujiwara
@@ -94,11 +94,19 @@ files:
 - lib/tempest.rb
 - lib/tempest/avatar_store.rb
 - lib/tempest/cli.rb
+- lib/tempest/commands.rb
+- lib/tempest/commands/base.rb
+- lib/tempest/commands/feed.rb
+- lib/tempest/commands/post.rb
+- lib/tempest/commands/tui.rb
+- lib/tempest/commands/whoami.rb
 - lib/tempest/config.rb
 - lib/tempest/cursor_store.rb
+- lib/tempest/date_filter.rb
 - lib/tempest/debug_log.rb
 - lib/tempest/facet.rb
 - lib/tempest/follows.rb
+- lib/tempest/handle_lookup.rb
 - lib/tempest/handle_resolver.rb
 - lib/tempest/http.rb
 - lib/tempest/id_var.rb
@@ -108,7 +116,10 @@ files:
 - lib/tempest/jetstream/subscription.rb
 - lib/tempest/jetstream/watchdog.rb
 - lib/tempest/kitty.rb
+- lib/tempest/output/json_writer.rb
+- lib/tempest/output/line_writer.rb
 - lib/tempest/post.rb
+- lib/tempest/post_view.rb
 - lib/tempest/repl/async_output.rb
 - lib/tempest/repl/dispatcher.rb
 - lib/tempest/repl/formatter.rb