routemaster-client 3.1.0 → 3.1.1

data/routemaster/cli/helper.rb

@@ -0,0 +1,61 @@
+require 'routemaster/client'
+require 'yaml'
+
+module Routemaster
+  module CLI
+    Exit = Class.new(StandardError)
+
+    class Helper
+      def initialize(config)
+        @config = config
+      end
+
+      def client
+        _configure_client
+        Routemaster::Client
+      end
+
+      private
+
+      def _bus_url
+        case @config.bus
+        when /^@(.*)/ then
+          domain = _rc_file_data.dig($1, :bus)
+          raise "No configuration for bus '#{$1}' found in .rtmrc" if domain.nil?
+          "https://#{domain}"
+        else
+          "https://#{@config.bus}"
+        end
+      end
+
+      def _bus_token
+        case @config.bus
+        when /^@(.*)/ then
+          @config.token || _rc_file_data.dig($1, :token)
+        else
+          @config.token
+        end
+      end
+
+      def _configure_client
+        Routemaster::Client.configure do |c|
+          c.url = _bus_url
+          c.uuid = _bus_token
+        end
+      end
+
+      def _rc_file_data
+        data =
+        if File.exist?('.rtmrc')
+          YAML.load_file('.rtmrc')
+        elsif File.exist?(File.expand_path '~/.rtmrc')
+          YAML.load_file(File.expand_path '~/.rtmrc')
+        else
+          {}
+        end
+
+        Hashie::Mash.new(data)
+      end
+    end
+  end
+end

data/routemaster/cli/pub.rb

@@ -0,0 +1,23 @@
+require 'routemaster/cli/base'
+
+module Routemaster
+  module CLI
+    class Pub < Base
+      prefix %w[pub]
+      syntax 'EVENT TOPIC URL'
+      descr %{
+          Publishes an event to the bus.  Note that the `TOKEN` passed in `options` must
+          be that of the subscriber, not a root token. `EVENT` must be one of `created`,
+          `updated`, `deleted`, or `noop`. `TOPIC` must be a valid topic name. `URL` must
+          be a valid HTTPS URL.
+      }
+
+      action do
+        bad_argc! unless argv.length == 3
+
+        event, topic, url = argv
+        helper.client.public_send(event, topic, url)
+      end
+    end
+  end
+end

data/routemaster/cli/sub.rb

@@ -0,0 +1,78 @@
+require 'routemaster/cli/base'
+require 'yaml'
+
+module Routemaster
+  module CLI
+    module Sub
+      class Add < Base
+        prefix %w[sub add]
+        syntax 'URL TOPIC [TOPIC...]'
+        descr %{
+          Adds (or updates) a subscription. Note that the `TOKEN` passed in `option` must be
+          that of the subscriber, not a root token.
+
+          `URL` must be HTTPS and include an authentication username (used by the bus
+            when delivering events).
+
+          `TOPICS` are topic names (which might not be published to yet).
+        }
+
+        options do |p|
+          p.on('--latency MS', %{
+            The target delivery latency for this subscriber (ie. how long to buffer events for). 
+          }) do |x|
+            config.latency = Integer(x)
+          end
+
+          p.on('--batch-size COUNT', %{
+            The maximum number of events in a delivered batch.
+          }) do |x|
+            config.batch_size = Integer(x)
+          end
+        end
+
+        action do
+          bad_argc! unless argv.length > 1
+
+          url, *topics = argv
+          params = {}
+          params[:timeout] = config.latency    if config.latency
+          params[:max]     = config.batch_size if config.batch_size
+          helper.client.subscribe(callback: url, topics: topics, **params)
+        end
+      end
+
+      class Del < Base
+        prefix %w[sub del]
+        syntax '[TOPIC...]'
+        descr %{
+          Updates or removes a subscription. Note that the `TOKEN` passed in `options` must
+          be that of the subscriber, not a root token.  If no `TOPICS` are specified, the
+          subscription is entirely removed.
+        }
+
+        action do
+          if argv.length > 0
+            helper.client.unsubscribe(*argv)
+          else
+            helper.client.unsubscribe_all
+          end
+        end
+      end
+
+      class List < Base
+        prefix %w[sub list]
+        descr %{
+          List existing subscriptions.
+        }
+
+        action do
+          bad_argc! if argv.length > 0
+
+          puts YAML.dump(helper.client.monitor_subscriptions.map(&:attributes))
+        end
+      end
+    end
+  end
+end
+

data/routemaster/cli/token.rb

@@ -0,0 +1,52 @@
+require 'routemaster/cli/base'
+
+module Routemaster
+  module CLI
+    module Token
+      class Add < Base
+        prefix %w[token add]
+        syntax 'SERVICE [TOKEN]'
+        descr %{
+          Adds `TOKEN` to the list of API tokens permitted to use the bus API. `SERVICE`
+          is a human-readable name for this token.
+        }
+
+        action do
+          bad_argc! unless (1..2).include? argv.length
+
+          service, token = argv
+          puts helper.client.token_add(name: service, token: token)
+        end
+      end
+
+      class Del < Base
+        prefix %w[token del]
+        syntax 'TOKEN'
+        descr %{
+          Removes `TOKEN` from permitted tokens if it exists.
+        }
+
+        action do
+          bad_argc! unless argv.length == 1
+
+          helper.client.token_del(token: argv.first)
+        end
+      end
+
+      class List < Base
+        prefix %w[token list]
+        descr %{
+          Lists currently permitted API tokens.
+        }
+
+        action do
+          bad_argc! unless argv.length == 0
+
+          helper.client.token_list.each do |t,n|
+            puts "#{t}\t#{n}"
+          end
+        end
+      end
+    end
+  end
+end

data/routemaster/cli/top_level.rb

@@ -0,0 +1,48 @@
+require 'routemaster/cli/helper'
+require 'routemaster/cli/token'
+require 'routemaster/cli/pub'
+require 'routemaster/cli/sub'
+
+module Routemaster
+  module CLI
+    class Toplevel
+      SUBCOMMANDS = [
+        Token::Add, Token::Del, Token::List,
+        Pub,
+        Sub::Add, Sub::Del, Sub::List,
+      ]
+
+      def initialize(stderr: STDERR, stdout: STDOUT)
+        @stderr = stderr
+        @stdout = stdout
+      end
+
+      def run(argv)
+        handler = SUBCOMMANDS.find do |kls|
+          argv.take(kls.prefix.length) == kls.prefix
+        end
+
+        bad_subcommand! if handler.nil?
+
+        subargv = argv[handler.prefix.length..-1]
+        handler.new(stderr: @stderr, stdout: @stdout).run(subargv)
+      end
+
+      private
+
+      def bad_subcommand!
+        log "Usage:"
+        SUBCOMMANDS.each do |kls|
+          log kls.syntax
+          log kls.descr
+        end
+        raise Exit, 1
+      end
+
+      def log(message)
+        @stderr.puts(message)
+      end
+    end
+  end
+end
+

data/routemaster/client.rb

@@ -4,12 +4,8 @@ require 'routemaster/client/configuration'
 require 'routemaster/client/version'
 require 'routemaster/client/errors'
 require 'routemaster/client/assertion_helpers'
-require 'routemaster/topic'
-require 'uri'
-require 'json'
-require 'faraday'
-require 'typhoeus'
-require 'typhoeus/adapters/faraday'
+require 'routemaster/client/topic'
+require 'routemaster/client/subscription'
 require 'oj'
 
 module Routemaster
@@ -89,18 +85,14 @@ module Routemaster
         topics.each do |t|
           response = _conn.delete("/subscriber/topics/#{t}")
 
-          unless response.success?
-            raise 'unsubscribe rejected'
-          end
+          raise ConnectionError, "unsubscribe rejected (status: #{response.status})" unless response.success?
         end
       end
 
       def unsubscribe_all
         response = _conn.delete('/subscriber')
 
-        unless response.success?
-          raise 'unsubscribe all rejected'
-        end
+        raise ConnectionError, "unsubscribe all rejected (status: #{response.status})" unless response.success?
       end
 
       def delete_topic(topic)
@@ -108,22 +100,51 @@ module Routemaster
 
         response = _conn.delete("/topics/#{topic}")
 
-        unless response.success?
-          raise 'failed to delete topic'
-        end
+        raise ConnectionError, "failed to delete topic (status: #{response.status})" unless response.success?
       end
 
       def monitor_topics
-        response = _conn.get('/topics') do |r|
-          r.headers['Content-Type'] = 'application/json'
+        response = _conn.get('/topics')
+        raise ConnectionError, "failed to connect to /topics (status: #{response.status})" unless response.success?
+
+        Oj.load(response.body).map do |raw_topic|
+          Topic.new raw_topic
         end
+      end
+
+      def monitor_subscriptions
+        response = _conn.get('/subscriptions')
+        raise ConnectionError, "failed to list subscribers (status: #{response.status})" unless response.success?
 
-        unless response.success?
-          raise 'failed to connect to /topics'
+        Oj.load(response.body).map do |raw_subscription|
+          Subscription.new raw_subscription
         end
+      end
 
-        Oj.load(response.body).map do |raw_topic|
-          Topic.new raw_topic
+      def token_add(name:, token: nil)
+        payload = { name: name }
+        payload[:token] = token if token
+        response = _conn.post('/api_tokens') do |r|
+          r.headers['Content-Type'] = 'application/json'
+          r.body = Oj.dump(payload, mode: :compat)
+        end
+
+        raise ConnectionError, "Failed to add token (status: #{response.status})" unless response.success?
+
+        Oj.load(response.body)['token']
+      end
+
+      def token_del(token:)
+        response = _conn.delete("/api_tokens/#{token}")
+        raise ConnectionError, "Failed to delete token (status: #{response.status})" unless response.success?
+        nil
+      end
+
+      def token_list
+        response = _conn.get("/api_tokens")
+        raise ConnectionError, "Failed to list tokens (status: #{response.status})" unless response.success?
+        Oj.load(response.body).each_with_object({}) do |entry, result|
+          result[entry['token']] = entry['name']
         end
       end
 
@@ -189,13 +210,14 @@ module Routemaster
         _assert_valid_timestamp!(t) if t
         _assert_valid_data(data) if data
 
+        t ||= _now if async
         backend = async ? async_backend : _synchronous_backend
         backend.send_event(event, topic, callback, t: t, data: data)
       end
 
       def _check_pulse!
         _conn.get('/pulse').tap do |response|
-          raise 'cannot connect to bus' unless response.success?
+          raise "Cannot connect to bus (status %s)" % response.status unless response.success?
         end
       end
 
@@ -210,6 +232,11 @@ module Routemaster
         warn "(in #{caller(2,1).first})"
       end
 
+      def _now
+        (Time.now.to_f * 1e3).to_i
+      end
+
+
       private :async_backend, :lazy
     end
   end

data/routemaster/client/backends/sidekiq/worker.rb

@@ -10,9 +10,19 @@ module Routemaster
           def perform(*args)
             # Sidekiq does not have transparent argument serialization.
             # This extracts the options so they can be passed on properly.
-            options = args.last.kind_of?(Hash) ? args.pop.symbolize_keys : {}
+            options = args.last.kind_of?(Hash) ? _symbolize_keys(args.pop) : {}
             Routemaster::Client::Connection.send_event(*args, **options)
           end
+
+          private 
+
+          def _symbolize_keys(h)
+            {}.tap do |result|
+              h.each do |k,v|
+                result[k.to_sym] = v
+              end
+            end
+          end
         end
       end
     end

data/routemaster/client/configuration.rb

@@ -19,6 +19,12 @@ module Routemaster
           _validate_all_options!
         end
 
+        def reset
+          %w[url uuid timeout async_backend lazy verify_ssl].each do |ivar|
+            remove_instance_variable :"@#{ivar}" if instance_variable_defined? :"@#{ivar}"
+          end
+        end
+
         private
 
         def _validate_all_options!

data/routemaster/client/connection.rb

@@ -1,3 +1,6 @@
+require 'faraday'
+require 'typhoeus'
+require 'typhoeus/adapters/faraday'
 require 'routemaster/client/configuration'
 
 module Routemaster
@@ -30,7 +33,8 @@ module Routemaster
             r.headers['Content-Type'] = 'application/json'
             r.body = Oj.dump(payload, mode: :strict)
           end
-          fail "event rejected (#{response.status})" unless response.success?
+
+          raise ConnectionError, "event rejected (status: #{response.status})" unless response.success?
 
           # Any issues would have caused an exception to be thrown
           true
@@ -42,9 +46,11 @@ module Routemaster
             r.body = Oj.dump(_stringify_keys options)
           end
 
-          unless response.success?
-            raise 'subscribe rejected'
-          end
+          raise ConnectionError, "subscribe rejected (status: #{response.status})" unless response.success?
+        end
+
+        def reset_connection
+          @_conn = nil
         end
 
         private