skyfall 0.4.1 → 0.5.1

data/lib/skyfall/{messages/websocket_message.rb → firehose/message.rb}

@@ -1,11 +1,12 @@
 require_relative '../errors'
 require_relative '../extensions'
+require_relative '../firehose'
 
 require 'cbor'
 require 'time'
 
 module Skyfall
-  class WebsocketMessage
+  class Firehose::Message
     using Skyfall::Extensions
 
     require_relative 'account_message'
@@ -14,26 +15,29 @@ module Skyfall
     require_relative 'identity_message'
     require_relative 'info_message'
     require_relative 'labels_message'
+    require_relative 'sync_message'
     require_relative 'tombstone_message'
     require_relative 'unknown_message'
 
-    attr_reader :type_object, :data_object
     attr_reader :type, :did, :seq
-
     alias repo did
 
+    # :nodoc: - consider this as semi-private API
+    attr_reader :type_object, :data_object
+
     def self.new(data)
       type_object, data_object = decode_cbor_objects(data)
 
       message_class = case type_object['t']
-        when '#account' then AccountMessage
-        when '#commit' then CommitMessage
-        when '#handle' then HandleMessage
-        when '#identity' then IdentityMessage
-        when '#info' then InfoMessage
-        when '#labels' then LabelsMessage
-        when '#tombstone' then TombstoneMessage
-        else UnknownMessage
+        when '#account'   then Firehose::AccountMessage
+        when '#commit'    then Firehose::CommitMessage
+        when '#handle'    then Firehose::HandleMessage
+        when '#identity'  then Firehose::IdentityMessage
+        when '#info'      then Firehose::InfoMessage
+        when '#labels'    then Firehose::LabelsMessage
+        when '#sync'      then Firehose::SyncMessage
+        when '#tombstone' then Firehose::TombstoneMessage
+        else Firehose::UnknownMessage
       end
 
       message = message_class.allocate
@@ -54,6 +58,10 @@ module Skyfall
       []
     end
 
+    def unknown?
+      self.is_a?(Firehose::UnknownMessage)
+    end
+
     def time
       @time ||= @data_object['time'] && Time.parse(@data_object['time'])
     end

data/lib/skyfall/firehose/operation.rb

@@ -0,0 +1,58 @@
+require_relative '../collection'
+require_relative '../firehose'
+
+module Skyfall
+  class Firehose::Operation
+    def initialize(message, json)
+      @message = message
+      @json = json
+    end
+
+    def repo
+      @message.repo
+    end
+
+    alias did repo
+
+    def path
+      @json['path']
+    end
+
+    def action
+      @json['action'].to_sym
+    end
+
+    def collection
+      @json['path'].split('/')[0]
+    end
+
+    def rkey
+      @json['path'].split('/')[1]
+    end
+
+    def uri
+      "at://#{repo}/#{path}"
+    end
+
+    def cid
+      @cid ||= @json['cid'] && CID.from_cbor_tag(@json['cid'])
+    end
+
+    def raw_record
+      @raw_record ||= @message.raw_record_for_operation(self)
+    end
+
+    def type
+      Collection.short_code(collection)
+    end
+
+    def inspectable_variables
+      instance_variables - [:@message]
+    end
+
+    def inspect
+      vars = inspectable_variables.map { |v| "#{v}=#{instance_variable_get(v).inspect}" }.join(", ")
+      "#<#{self.class}:0x#{object_id} #{vars}>"
+    end
+  end
+end

data/lib/skyfall/firehose/sync_message.rb

@@ -0,0 +1,9 @@
+require_relative '../firehose'
+
+module Skyfall
+  class Firehose::SyncMessage < Firehose::Message
+    def rev
+      @rev ||= @data_object['rev']
+    end
+  end
+end

data/lib/skyfall/firehose/tombstone_message.rb

@@ -0,0 +1,11 @@
+require_relative '../firehose'
+
+module Skyfall
+
+  #
+  # Note: this event type is deprecated and will stop being emitted at some point.
+  # You should instead listen for 'account' events (Skyfall::Firehose::AccountMessage).
+  #
+  class Firehose::TombstoneMessage < Firehose::Message
+  end
+end

data/lib/skyfall/firehose/unknown_message.rb

@@ -0,0 +1,6 @@
+require_relative '../firehose'
+
+module Skyfall
+  class Firehose::UnknownMessage < Firehose::Message
+  end
+end

data/lib/skyfall/firehose.rb

@@ -0,0 +1,79 @@
+require_relative 'stream'
+require 'uri'
+
+module Skyfall
+  class Firehose < Stream
+    SUBSCRIBE_REPOS = "com.atproto.sync.subscribeRepos"
+    SUBSCRIBE_LABELS = "com.atproto.label.subscribeLabels"
+
+    NAMED_ENDPOINTS = {
+      :subscribe_repos => SUBSCRIBE_REPOS,
+      :subscribe_labels => SUBSCRIBE_LABELS
+    }
+
+    attr_accessor :cursor
+
+    def self.new(server, endpoint, cursor = nil)
+      # to be removed in 0.6
+      instance = self.allocate
+      instance.send(:initialize, server, endpoint, cursor)
+      instance
+    end
+
+    def initialize(server, endpoint, cursor = nil)
+      require_relative 'firehose/message'
+      super(server)
+
+      @endpoint = check_endpoint(endpoint)
+      @cursor = check_cursor(cursor)
+      @root_url = @root_url.chomp('/')
+
+      if URI(@root_url).path != ''
+        raise ArgumentError, "Server parameter should not include any path"
+      end
+    end
+
+    def handle_message(msg)
+      data = msg.data.pack('C*')
+      @handlers[:raw_message]&.call(data)
+
+      if @handlers[:message]
+        atp_message = Message.new(data)
+        @cursor = atp_message.seq
+        @handlers[:message].call(atp_message)
+      else
+        @cursor = nil
+      end
+    end
+
+
+    private
+
+    def build_websocket_url
+      @root_url + "/xrpc/" + @endpoint + (@cursor ? "?cursor=#{@cursor}" : "")
+    end
+
+    def check_cursor(cursor)
+      if cursor.nil?
+        nil
+      elsif cursor.is_a?(Integer) || cursor.is_a?(String) && cursor =~ /^[0-9]+$/
+        cursor.to_i
+      else
+        raise ArgumentError, "Invalid cursor: #{cursor.inspect} - cursor must be an integer number"
+      end
+    end
+
+    def check_endpoint(endpoint)
+      if endpoint.is_a?(String)
+        raise ArgumentError.new("Invalid endpoint name: #{endpoint}") if endpoint.strip == '' || !endpoint.include?('.')
+      elsif endpoint.is_a?(Symbol)
+        raise ArgumentError.new("Unknown endpoint: #{endpoint}") if NAMED_ENDPOINTS[endpoint].nil?
+        endpoint = NAMED_ENDPOINTS[endpoint]
+      else
+        raise ArgumentError, "Endpoint should be a string or a symbol"
+      end
+
+      endpoint
+    end
+  end
+end

data/lib/skyfall/jetstream/account_message.rb

@@ -0,0 +1,19 @@
+require_relative '../errors'
+require_relative '../jetstream'
+
+module Skyfall
+  class Jetstream::AccountMessage < Jetstream::Message
+    def initialize(json)
+      raise DecodeError.new("Missing event details") if json['account'].nil?
+      super
+    end
+
+    def active?
+      @json['account']['active']
+    end
+
+    def status
+      @json['account']['status']&.to_sym
+    end
+  end
+end

data/lib/skyfall/jetstream/commit_message.rb

@@ -0,0 +1,16 @@
+require_relative '../errors'
+require_relative '../jetstream'
+require_relative 'operation'
+
+module Skyfall
+  class Jetstream::CommitMessage < Jetstream::Message
+    def initialize(json)
+      raise DecodeError.new("Missing event details") if json['commit'].nil?
+      super
+    end
+
+    def operations
+      @operations ||= [Jetstream::Operation.new(self, json['commit'])]
+    end
+  end
+end

data/lib/skyfall/jetstream/identity_message.rb

@@ -0,0 +1,15 @@
+require_relative '../errors'
+require_relative '../jetstream'
+
+module Skyfall
+  class Jetstream::IdentityMessage < Jetstream::Message
+    def initialize(json)
+      raise DecodeError.new("Missing event details") if json['identity'].nil?
+      super
+    end
+
+    def handle
+      @json['identity']['handle']
+    end
+  end
+end

data/lib/skyfall/jetstream/message.rb

@@ -0,0 +1,54 @@
+require_relative '../errors'
+require_relative '../jetstream'
+
+require 'time'
+
+module Skyfall
+  class Jetstream::Message
+    require_relative 'account_message'
+    require_relative 'commit_message'
+    require_relative 'identity_message'
+    require_relative 'unknown_message'
+
+    attr_reader :did, :type, :time_us
+    alias repo did
+    alias seq time_us
+
+    # :nodoc: - consider this as semi-private API
+    attr_reader :json
+
+    def self.new(data)
+      json = JSON.parse(data)
+
+      message_class = case json['kind']
+        when 'account'  then Jetstream::AccountMessage
+        when 'commit'   then Jetstream::CommitMessage
+        when 'identity' then Jetstream::IdentityMessage
+        else Jetstream::UnknownMessage
+      end
+
+      message = message_class.allocate
+      message.send(:initialize, json)
+      message
+    end
+
+    def initialize(json)
+      @json = json
+      @type = @json['kind'].to_sym
+      @did = @json['did']
+      @time_us = @json['time_us']
+    end
+
+    def unknown?
+      self.is_a?(Jetstream::UnknownMessage)
+    end
+
+    def operations
+      []
+    end
+
+    def time
+      @time ||= @json['time_us'] && Time.at(@json['time_us'] / 1_000_000.0)
+    end
+  end
+end

data/lib/skyfall/jetstream/operation.rb

@@ -0,0 +1,58 @@
+require_relative '../collection'
+require_relative '../jetstream'
+
+module Skyfall
+  class Jetstream::Operation
+    def initialize(message, json)
+      @message = message
+      @json = json
+    end
+
+    def repo
+      @message.repo
+    end
+
+    alias did repo
+
+    def path
+      @json['collection'] + '/' + @json['rkey']
+    end
+
+    def action
+      @json['operation'].to_sym
+    end
+
+    def collection
+      @json['collection']
+    end
+
+    def rkey
+      @json['rkey']
+    end
+
+    def uri
+      "at://#{repo}/#{collection}/#{rkey}"
+    end
+
+    def cid
+      @cid ||= @json['cid'] && CID.from_json(@json['cid'])
+    end
+
+    def raw_record
+      @json['record']
+    end
+
+    def type
+      Collection.short_code(collection)
+    end
+
+    def inspectable_variables
+      instance_variables - [:@message]
+    end
+
+    def inspect
+      vars = inspectable_variables.map { |v| "#{v}=#{instance_variable_get(v).inspect}" }.join(", ")
+      "#<#{self.class}:0x#{object_id} #{vars}>"
+    end
+  end
+end

data/lib/skyfall/jetstream/unknown_message.rb

@@ -0,0 +1,6 @@
+require_relative '../jetstream'
+
+module Skyfall
+  class Jetstream::UnknownMessage < Jetstream::Message
+  end
+end

data/lib/skyfall/jetstream.rb

@@ -0,0 +1,121 @@
+require_relative 'stream'
+
+require 'json'
+require 'time'
+require 'uri'
+
+module Skyfall
+  class Jetstream < Stream
+    def self.new(server, params = {})
+      # to be removed in 0.6
+      instance = self.allocate
+      instance.send(:initialize, server, params)
+      instance
+    end
+
+    attr_accessor :cursor
+
+    def initialize(server, params = {})
+      require_relative 'jetstream/message'
+      super(server)
+
+      @root_url = @root_url.chomp('/')
+
+      if URI(@root_url).path != ''
+        raise ArgumentError, "Server parameter should not include any path"
+      end
+
+      @params = check_params(params)
+      @cursor = @params.delete(:cursor)
+    end
+
+    def handle_message(msg)
+      data = msg.data
+      @handlers[:raw_message]&.call(data)
+
+      if @handlers[:message]
+        jet_message = Message.new(data)
+        @cursor = jet_message.time_us
+        @handlers[:message].call(jet_message)
+      else
+        @cursor = nil
+      end
+    end
+
+    private
+
+    def build_websocket_url
+      params = @cursor ? @params.merge(cursor: @cursor) : @params
+      query = URI.encode_www_form(params)
+
+      @root_url + "/subscribe" + (query.length > 0 ? "?#{query}" : '')
+    end
+
+    def check_params(params)
+      params ||= {}
+      processed = {}
+
+      raise ArgumentError.new("Params should be a hash") unless params.is_a?(Hash)
+
+      params.each do |k, v|
+        next if v.nil?
+
+        if k.is_a?(Symbol)
+          k = k.to_s
+        elsif !k.is_a?(String)
+          raise ArgumentError.new("Invalid params key: #{k.inspect}")
+        end
+
+        k = k.gsub(/_([a-zA-Z])/) { $1.upcase }.to_sym
+        processed[k] = check_option(k, v)
+      end
+
+      processed
+    end
+
+    def check_option(k, v)
+      case k
+      when :wantedCollections
+        check_wanted_collections(v)
+      when :wantedDids
+        check_wanted_dids(v)
+      when :cursor
+        check_cursor(v)
+      when :compress, :requireHello
+        raise ArgumentError.new("Skyfall::Jetstream doesn't support the #{k.inspect} option yet")
+      else
+        raise ArgumentError.new("Unknown option: #{k.inspect}")
+      end
+    end
+
+    def check_wanted_collections(list)
+      list = [list] unless list.is_a?(Array)
+
+      list.map do |c|
+        if c.is_a?(String)
+          # TODO: more validation
+          c
+        elsif c.is_a?(Symbol)
+          Collection.from_short_code(c) or raise ArgumentError.new("Unknown collection symbol: #{c.inspect}")
+        else
+          raise ArgumentError.new("Invalid collection argument: #{c.inspect}")
+        end
+      end
+    end
+
+    def check_wanted_dids(list)
+      list = [list] unless list.is_a?(Array)
+
+      if x = list.detect { |c| !c.is_a?(String) || c !~ /\Adid:[a-z]+:/ }
+        raise ArgumentError.new("Invalid DID argument: #{x.inspect}")
+      end
+
+      # TODO: more validation
+      list
+    end
+
+    def check_cursor(cursor)
+      cursor.to_i
+    end
+  end
+end

data/lib/skyfall/stream.rb

@@ -1,30 +1,32 @@
-require_relative 'messages/websocket_message'
-
 require 'eventmachine'
 require 'faye/websocket'
 require 'uri'
 
+require_relative 'version'
+
 module Skyfall
   class Stream
-    SUBSCRIBE_REPOS = "com.atproto.sync.subscribeRepos"
-    SUBSCRIBE_LABELS = "com.atproto.label.subscribeLabels"
-
-    NAMED_ENDPOINTS = {
-      :subscribe_repos => SUBSCRIBE_REPOS,
-      :subscribe_labels => SUBSCRIBE_LABELS
-    }
-
     EVENTS = %w(message raw_message connecting connect disconnect reconnect error timeout)
-
     MAX_RECONNECT_INTERVAL = 300
 
-    attr_accessor :cursor, :auto_reconnect, :last_update, :user_agent
+    attr_accessor :auto_reconnect, :last_update, :user_agent
     attr_accessor :heartbeat_timeout, :heartbeat_interval, :check_heartbeat
 
-    def initialize(server, endpoint, cursor = nil)
-      @endpoint = check_endpoint(endpoint)
-      @root_url = build_root_url(server)
-      @cursor = check_cursor(cursor)
+    def self.new(server, endpoint = nil, cursor = nil)
+      # to be removed in 0.6
+      if endpoint || cursor
+        STDERR.puts "Warning: Skyfall::Stream has been renamed to Skyfall::Firehose. This initializer will be removed in the next version."
+        Firehose.new(server, endpoint, cursor)
+      else
+        instance = self.allocate
+        instance.send(:initialize, server)
+        instance
+      end
+    end
+
+    def initialize(service)
+      @root_url = build_root_url(service)
+
       @handlers = {}
       @auto_reconnect = true
       @check_heartbeat = false
@@ -53,7 +55,7 @@ module Skyfall
           @handlers[:error]&.call(e)
         end
 
-        @ws = Faye::WebSocket::Client.new(url, nil, { headers: { 'User-Agent' => user_agent }})
+        @ws = build_websocket_client(url)
 
         @ws.on(:open) do |e|
           @handlers[:connect]&.call
@@ -65,17 +67,7 @@ module Skyfall
           @reconnecting = false
           @connection_attempts = 0
           @last_update = Time.now
-
-          data = msg.data.pack('C*')
-          @handlers[:raw_message]&.call(data)
-
-          if @handlers[:message]
-            atp_message = Skyfall::WebsocketMessage.new(data)
-            @cursor = atp_message.seq
-            @handlers[:message].call(atp_message)
-          else
-            @cursor = nil
-          end
+          handle_message(msg)
         end
 
         @ws.on(:error) do |e|
@@ -103,6 +95,11 @@ module Skyfall
       end
     end
 
+    def handle_message(msg)
+      data = msg.data
+      @handlers[:raw_message]&.call(data)
+    end
+
     def reconnect
       @reconnecting = true
       @connection_attempts = 0
@@ -121,6 +118,10 @@ module Skyfall
     alias close disconnect
 
     def default_user_agent
+      version_string
+    end
+
+    def version_string
       "Skyfall/#{Skyfall::VERSION}"
     end
 
@@ -184,44 +185,29 @@ module Skyfall
       end
     end
 
-    def build_websocket_url
-      @root_url + "/xrpc/" + @endpoint + (@cursor ? "?cursor=#{@cursor}" : "")
-    end
-
-    def check_cursor(cursor)
-      if cursor.nil?
-        nil
-      elsif cursor.is_a?(Integer) || cursor.is_a?(String) && cursor =~ /^[0-9]+$/
-        cursor.to_i
-      else
-        raise ArgumentError, "Invalid cursor: #{cursor.inspect} - cursor must be an integer number"
-      end
+    def build_websocket_client(url)
+      Faye::WebSocket::Client.new(url, nil, { headers: { 'User-Agent' => user_agent }})
     end
 
-    def check_endpoint(endpoint)
-      if endpoint.is_a?(String)
-        raise ArgumentError.new("Invalid endpoint name: #{endpoint}") if endpoint.strip == '' || !endpoint.include?('.')
-      elsif endpoint.is_a?(Symbol)
-        raise ArgumentError.new("Unknown endpoint: #{endpoint}") if NAMED_ENDPOINTS[endpoint].nil?
-        endpoint = NAMED_ENDPOINTS[endpoint]
-      else
-        raise ArgumentError, "Endpoint should be a string or a symbol"
-      end
-
-      endpoint
+    def build_websocket_url
+      @root_url
     end
 
-    def build_root_url(server)
-      if server.is_a?(String)
-        if server.start_with?('ws://') || server.start_with?('wss://')
-          server
-        elsif server.strip.empty? || server.include?('/')
-          raise ArgumentError, "Server parameter should be a hostname or a ws:// or wss:// URL"
+    def build_root_url(service)
+      if service.is_a?(String)
+        if service.include?('/')
+          uri = URI(service)
+          if uri.scheme != 'ws' && uri.scheme != 'wss'
+            raise ArgumentError, "Service parameter should be a hostname or a ws:// or wss:// URL"
+          end
+          uri.to_s
         else
-          "wss://#{server}"
+          service = "wss://#{service}"
+          uri = URI(service) # raises if invalid
+          service
         end
       else
-        raise ArgumentError, "Server parameter should be a string"
+        raise ArgumentError, "Service parameter should be a string"
       end
     end
   end

data/lib/skyfall/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Skyfall
-  VERSION = "0.4.1"
+  VERSION = "0.5.1"
 end