ratproto 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ba70d80557249c2c85eeb1e185f1cc0261800b4d3a0aa07f2cf6b777fdd512e
-  data.tar.gz: a722e3c61aca7f8827b682885fed4b7fddaef19eaa48b8d8635d82911dc489ff
+  metadata.gz: c5fee431ed4b84e739b1ff36768bfb1db007dd1457d63dfd1ba5279c92b66c00
+  data.tar.gz: 260c01a4b45629e2c55026404ad5bbbc6fe9e93a22647cba85d4897b11a7ed81
 SHA512:
-  metadata.gz: 3334b2e69f3a8b4dcb1bc09781ff49d8884125c629b028c8a3b16f5428a341f9a6b0c03390631f77a57b88f40b121a69e5441eba119685d43b892e53d38ee560
-  data.tar.gz: 15c356cacc4116c3d2cf142677c538eeb9691e108a1fde6f807267ae8de96cb12aec845d42199a73da2e4db9b43a9ab347d4cab801a9008c53bf6c7c4b02e47e
+  metadata.gz: ff763fe7c82d4a645de4228bf909e362b33efd98094390451bcf99b6b64c9ce165f83f17c4325746f7f4c73a076d3824944b5422c871f6bf25fdc89331f1a7a3
+  data.tar.gz: 855c076aa6553f04635f5275e2b94bef28bd78d91f816b9446cad9f8c5d305719dcb4dbdc85c986d9b736d3355d3cc4d2faec59425c2eca9f93b821c7cbf906e

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [0.3.4] - 2026-09-03
+
+- `stream`: for Jetstream sources, you can pass e.g. '-4h' as the cursor to start from 4 hours ago
+
+## [0.3.3] - 2026-08-17
+
+- `stream`: added `--print-time` mode, bug fixes, unified timestamp formats
+- added `status` command that prints account status
+
 ## [0.3.2] - 2026-07-30
 
 - `stream`: filter by record operation type using `-o`

data/lib/ratproto/cli.rb

@@ -5,6 +5,7 @@ require 'clamp'
 require_relative 'version'
 require_relative 'ext'
 require_relative 'commands/base'
+require_relative 'commands/account_status'
 require_relative 'commands/fetch'
 require_relative 'commands/resolve'
 require_relative 'commands/stream'
@@ -51,6 +52,7 @@ module RatProto
     end
 
     subcommand 'fetch', 'fetch a single record given its at:// URI', Commands::Fetch
+    subcommand 'status', 'print account status', Commands::AccountStatus
     subcommand 'stream', 'stream events from a relay or PDS firehose', Commands::Stream
     subcommand 'stream-labels', 'stream labels a labeller firehose', Commands::StreamLabels
     subcommand 'resolve', 'resolve a DID or @handle', Commands::Resolve

data/lib/ratproto/commands/account_status.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'didkit'
+
+require_relative 'base'
+
+module RatProto
+  module Commands
+    class AccountStatus < Base
+      banner 'Print status of an account on its PDS'
+
+      parameter 'TARGET', 'DID or handle'
+
+      option ['-s', '--status'], :flag, 'print only the status without a full message'
+
+      def execute
+        begin
+          resolved_did = DID.resolve_handle(target)
+        rescue StandardError => e
+          signal_error "resolving #{target.inspect}: #{e.class}: #{e.message}"
+        end
+
+        if resolved_did.nil?
+          signal_error "couldn't resolve #{target}"
+        end
+
+        result = resolved_did.account_status
+
+        if status?
+          puts (result&.to_s || 'deleted')
+          return
+        end
+
+        case result
+        when :active
+          puts "#{resolved_did} at #{resolved_did.document.pds_host}: account active"
+        when nil
+          puts "#{resolved_did} at #{resolved_did.document.pds_host}: account not found"
+        else
+          puts "#{resolved_did} at #{resolved_did.document.pds_host}: account inactive (status = #{result})"
+        end
+      end
+    end
+  end
+end

data/lib/ratproto/commands/stream.rb

@@ -17,13 +17,8 @@ module RatProto
 
       option ['-j', '--jetstream'], :flag, 'use a Jetstream source'
 
-      option(
-        ['-r', '--cursor'], 'CURSOR',
+      option ['-r', '--cursor'], 'CURSOR',
         'start from a given cursor (pass 0 to read from the beginning of the playback window)'
-      ) do |value|
-        raise ArgumentError, 'must be a decimal integer' unless value =~ /\A\d+\z/
-        value.to_i
-      end
 
       option ['-d', '--did'], 'DID[,DID...]', 'filter events by DID (comma-separated or repeated)',
              multivalued: true, attribute_name: :did_values
@@ -40,23 +35,26 @@ module RatProto
              'print account status events (default: enabled unless filtering by collection or operation)'
 
       option ['-q', '--quiet'], :flag, 'disable status messages'
-      option ['-s', '--print-cursor'], :flag, 'only print current cursor (seq)'
+      option ['-s', '--print-cursor'], :flag, 'only print cursor (seq) of first event and disconnect'
+      option ['--print-time'], :flag, 'only print timestamp of first event and disconnect'
 
 
       def execute
         require 'skyfall'
 
         prepare_filters
+        validate_cursor
 
         @sky = build_stream
         configure_interrupt_handler
 
-        if print_cursor?
+        if print_cursor? || print_time?
           @sky.on_message do |msg|
             print_cursor_and_stop(msg)
             next
           end
 
+          @sky.on_error { |e| report_error(e) }
           @sky.connect
         else
           configure_callbacks
@@ -95,6 +93,29 @@ module RatProto
         @operations = (@operations.length > 0) ? @operations.map { |operation| validate_operation(operation) } : nil
       end
 
+      def validate_cursor
+        return if cursor.nil?
+
+        if cursor.start_with?('-')
+          if !jetstream?
+            signal_usage_error("time offset cursors are only supported with Jetstream right now")
+          end
+
+          if cursor =~ /\A\-([0-9]+(\.[0-9]+)?)([hms])\z/i
+            amount, unit = $1, $3.downcase
+
+            multiplier = { 'h' => 3600, 'm' => 60, 's' => 1 }[unit]
+            @cursor = (Time.now.to_f - amount.to_f * multiplier) * 1_000_000
+          else
+            signal_usage_error("invalid time offset specifier: #{cursor}")
+          end
+        elsif cursor =~ /\A[0-9]+\z/
+          @cursor = cursor.to_i
+        else
+          signal_usage_error("cursor must be an integer number or an offset specifier")
+        end
+      end
+
       def validate_operation(operation)
         if OPERATION_TYPES.include?(operation)
           operation.to_sym
@@ -106,7 +127,7 @@ module RatProto
       def build_stream
         if jetstream?
           options = {}
-          options[:cursor] = cursor if cursor
+          options[:cursor] = @cursor if @cursor
 
           # pass DID/collection filters to Jetstream to filter events server-side
           options[:wanted_dids] = @dids if @dids
@@ -147,12 +168,12 @@ module RatProto
       end
 
       def print_commit_message(msg)
+        time = msg.time.getlocal
+        @last_timestamp = time
+
         return if @no_collections
         return if @dids && !@dids.include?(msg.repo)
 
-        time = msg.time.getlocal.iso8601
-        @last_timestamp = time
-
         msg.operations.each do |op|
           next if @collections && !@collections.include?(op.collection)
           next if @operations && !@operations.include?(op.action)
@@ -163,11 +184,11 @@ module RatProto
       end
 
       def print_account_message(msg)
-        return if @dids && !@dids.include?(msg.repo)
-
-        time = msg.time.getlocal.iso8601
+        time = msg.time.getlocal
         @last_timestamp = time
 
+        return if @dids && !@dids.include?(msg.repo)
+
         status = (msg.active?) ? :active : msg.status
 
         puts "[#{time}] (#{msg.seq}) #{msg.repo} #account (status = #{status.inspect})"
@@ -198,7 +219,8 @@ module RatProto
       def print_cursor_and_stop(msg)
         return if @disconnecting
 
-        puts msg.seq
+        puts (print_time?) ? msg.time.getlocal : msg.seq
+
         @sky.disconnect
         @disconnecting = true
       end

data/lib/ratproto/commands/stream_labels.rb

@@ -25,7 +25,8 @@ module RatProto
              multivalued: true, attribute_name: :target_patterns
 
       option ['-q', '--quiet'], :flag, 'disable status messages'
-      option ['-s', '--print-cursor'], :flag, 'only print current cursor (seq)'
+      option ['-s', '--print-cursor'], :flag, 'only print cursor (seq) of first event and disconnect'
+      option ['--print-time'], :flag, 'only print timestamp of first event and disconnect'
 
 
       def execute
@@ -38,12 +39,13 @@ module RatProto
         @sky = Skyfall::Firehose.new(@service, :subscribe_labels, cursor)
         configure_interrupt_handler
 
-        if print_cursor?
+        if print_cursor? || print_time?
           @sky.on_message do |msg|
             print_cursor_and_stop(msg)
             next
           end
 
+          @sky.on_error { |e| log "ERROR: #{e.message}" }
           @sky.connect
         else
           configure_callbacks
@@ -91,19 +93,20 @@ module RatProto
         @sky.on_disconnect { log "Disconnected" }
         @sky.on_reconnect  { log "Connection lost, trying to reconnect..." }
         @sky.on_timeout    { log "Connection stalled, triggering a reconnect..." }
-        @sky.on_error      { |e| log "ERROR: #{e}" }
+        @sky.on_error      { |e| log "ERROR: #{e.message}" }
 
         @sky.on_message do |msg|
           next unless msg.type == :labels
 
           msg.labels.each do |label|
+            time = label.created_at.getlocal
+            @last_timestamp = time
+
             next if @labels && !@labels.include?(label.value)
             next if @targets && @targets.none? { |pattern| pattern.match?(label.subject) }
 
-            @last_timestamp = label.created_at
-
             json = JSON.generate(label.data.except('cid', 'cts', 'sig', 'src', 'ver'))
-            puts "[#{label.created_at}] (#{msg.seq}) #{json}"
+            puts "[#{time}] (#{msg.seq}) #{json}"
           end
         end
       end
@@ -123,7 +126,8 @@ module RatProto
       def print_cursor_and_stop(msg)
         return if @disconnecting
 
-        puts msg.seq
+        puts (print_time?) ? msg.labels.first.created_at.getlocal : msg.seq
+
         @sky.disconnect
         @disconnecting = true
       end

data/lib/ratproto/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RatProto
-  VERSION = "0.3.2"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ratproto
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - Kuba Suder
@@ -102,6 +102,7 @@ files:
 - exe/rat
 - lib/ratproto.rb
 - lib/ratproto/cli.rb
+- lib/ratproto/commands/account_status.rb
 - lib/ratproto/commands/base.rb
 - lib/ratproto/commands/fetch.rb
 - lib/ratproto/commands/resolve.rb
@@ -117,6 +118,7 @@ metadata:
   bug_tracker_uri: https://tangled.org/mackuba.eu/ratproto/issues
   changelog_uri: https://tangled.org/mackuba.eu/ratproto/blob/master/CHANGELOG.md
   source_code_uri: https://tangled.org/mackuba.eu/ratproto
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -131,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.18
 specification_version: 4
 summary: Ruby CLI tool for accessing Bluesky API / ATProto
 test_files: []