tempest-rb 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c28613c22b61422cea99a83eb372bca8a1c1404c51f5d491846380bdd33d5196
-  data.tar.gz: efbfee28e847621e49afdc75da6d3ada58513dc16c29eaa29c1ef99753cb1336
+  metadata.gz: 425f1a89085c0d2d762d9ef2697d0f34b752e7bfb479ff4dec077678987fa378
+  data.tar.gz: e61021b6f27a4e038f8b1b4d51697c169f5c90b99f7dc4ea0cdcfffacde4ba65
 SHA512:
-  metadata.gz: f1670a1a245c27a1177efca4ee74fc23f83d625b40fbabe368126d82d25c5866768800adabe2c16a38094b7abc03ee36138a5d72c51a83b39f0dfa0b019362b3
-  data.tar.gz: 5bdb09991abbf954111f27bce93b8d6d22900442f910f70994e97130cb657a52fd083005c889d4aa1bc15a0c35617e6c480363e9bfd63f1ffc0ef82646e8cfc8
+  metadata.gz: d3058fd2a2457246b63225ad6f4d46ac85e90e791dc0f364da1bc37ee1ab6b4ecb185aca488cd2f83c59e79c168d21e65f115a0b08c2cf49865ccf2f2c4e76f1
+  data.tar.gz: 6c092f9332873d3cea39f85fa33b8447f6fc4b8685c8b25b18490de845ac0eda408de15494a29e18a7f465d3e005248bbacb497f2365a4b7854512e10fcc86bf

data/lib/tempest/avatar_store.rb

@@ -123,6 +123,11 @@ module Tempest
       cached = @mutex.synchronize { @cache[did] }
       return cached_value(cached) unless cached.nil?
 
+      if @async && (path = cached_file_for(did))
+        @mutex.synchronize { @cache[did] = path }
+        return path
+      end
+
       if @async
         enqueue_resolve(did)
         nil
@@ -141,6 +146,10 @@ module Tempest
       value.equal?(NOT_FOUND) ? nil : value
     end
 
+    def cached_file_for(did)
+      Dir.glob(File.join(@cache_dir, "#{sanitize(did)}__*.png")).max_by { |path| File.mtime(path) }
+    end
+
     def resolve_and_cache(did)
       path = resolve_sync(did)
       @mutex.synchronize { @cache[did] = path.nil? ? NOT_FOUND : path }

data/lib/tempest/cli.rb

@@ -100,6 +100,7 @@ module Tempest
         avatar_store: avatar_store,
         timeline_store: timeline_store(env),
         opener: opener_for(env: env),
+        reauth: build_reauth(env, stdout, stdin, session_factory),
       )
 
       begin
@@ -155,6 +156,17 @@ module Tempest
       value.nil? || value.empty? ? nil : value
     end
 
+    # Builds the proc REPL::Runner uses to honour `:relogin`. The lambda
+    # re-reads credentials from `env` on each call (so a user can update env
+    # in-process if needed) and goes through the same 2FA prompt path as
+    # initial sign-in.
+    def build_reauth(env, stdout, stdin, session_factory)
+      lambda do
+        config = Tempest::Config.from_env(env)
+        create_with_2fa(config, env, stdout, stdin, session_factory)
+      end
+    end
+
     def create_with_2fa(config, env, stdout, stdin, session_factory)
       token = env["TEMPEST_AUTH_FACTOR_TOKEN"]
       session_factory.call(config, auth_factor_token: token)

data/lib/tempest/repl/dispatcher.rb

@@ -5,7 +5,7 @@ module Tempest
     Command = Data.define(:name, :args)
 
     class Dispatcher
-      KNOWN_COMMANDS = %i[timeline quit help stream open].freeze
+      KNOWN_COMMANDS = %i[timeline quit help stream open relogin].freeze
       DOLLAR_ID = /\A\$[A-Z]{2}\z/.freeze
 
       def dispatch(input)

data/lib/tempest/repl/formatter.rb

@@ -190,7 +190,7 @@ module Tempest
         prefix += id_label(var) if var
         prefix += bracket(time) if time
         identity = handle ? handle_label(handle) : did_label(did)
-        identity = "#{icon} #{identity}" if icon
+        identity = "#{icon}  #{identity}" if icon
         "#{prefix}#{identity}: #{text}"
       end
 

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

@@ -37,6 +37,7 @@ module Tempest
 
       def disable
         return unless @enabled
+        @io.print "\e_Ga=d,q=2\e\\"
         @io.print "\e[r"
         @io.flush if @io.respond_to?(:flush)
         @enabled = false
@@ -130,6 +131,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.1"
 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.1
 platform: ruby
 authors:
 - Yuya Fujiwara