@@ -1,4 +1,5 @@ log/*.log tmp/pids/*.pid config/settings.yml -tmp/datastore.json \ No newline at end of file +config/connections.yml + .gitignore @@ -3,8 +3,9 @@ require 'rubygems' require File.join(File.dirname(__FILE__), "..", "lib", "marvin") Marvin::Application.processing(ARGV) do |a| - - a.banner = "Marvin v#{Marvin::VERSION} - An IRC Library for Ruby" + version = Marvin.version + version << "p#{Marvin::VERSION[3]}" if Marvin::VERSION[3] != 0 + a.banner = "Marvin v#{version} - An IRC Library for Ruby" a.generator! bin/marvin @@ -26,13 +26,22 @@ module Marvin @host_with_port end - def method_missing(name, *args) + def method_missing(name, *args, &blk) logger.debug "Proxying #{name}(#{args.inspect[1..-2]}) to #{@host_with_port}" + cb = nil + if blk.present? + cb = proc do |_, options| + if options.is_a?(Hash) + value = options.delete("return-value") + blk.call(value) + end + end + end @connection.send_message(:action, { "action" => name.to_s, "arguments" => args, "client-host" => @host_with_port - }) + }, &cb) end end lib/marvin/distributed/client.rb @@ -2,7 +2,6 @@ module Marvin module Distributed class Handler < Marvin::Base - EVENT_WHITELIST = [:incoming_message, :incoming_action] QUEUE_PROCESSING_SPACING = 3 lib/marvin/distributed/handler.rb @@ -63,6 +63,11 @@ module Marvin enable_ssl end + def handle_noop(opts = {}) + # DO NOTHING. + logger.debug "no-op" + end + # After the connection is made and / or ssl is enabled. def post_connect end @@ -130,6 +135,7 @@ module Marvin # Default Handlers register_handler_method :enable_ssl register_handler_method :enabled_ssl + register_handler_method :noop def connected? instance_variable_defined?(:@connected) && @connected lib/marvin/distributed/protocol.rb @@ -35,7 +35,7 @@ module Marvin end def post_connect - logger.info "Connection started, welcoming" + logger.debug "Remote client available, welcoming" send_message(:welcome) complete_processing end @@ -86,14 +86,17 @@ module Marvin def handle_action(options = {}) return if fails_auth! logger.debug "Handling action from on #{self.host_with_port}" - server = lookup_client_for(options["client-host"]) + target = lookup_client_for(options["client-host"]) action = options["action"] arguments = [*options["arguments"]] - return if server.blank? || action.blank? + return if target.blank? || action.blank? begin a = action.to_sym - if self.action_whitelist.include?(a) - server.send(a, *arguments) if server.respond_to?(a) + if self.action_whitelist.include?(a) && target.respond_to?(a) + res = target.send(a, *arguments) + if @callback_id.present? && res.respond_to?(:to_json) + send_message_reply(:noop, {"return-value" => res.to_json}) + end else logger.warn "Client attempted invalid action #{a.inspect}" end lib/marvin/distributed/server.rb config/connections.yml c055b4e823071d8a1570379b8fc9dcb63f494c61 Darcy Laycock sutto@sutto.net http://github.com/Sutto/marvin/commit/659e46b140368854555a887824551a6b1d104ee0 659e46b140368854555a887824551a6b1d104ee0 2009-09-18T16:50:45-07:00 2009-09-18T16:50:45-07:00 More work on improving the distributed stuff abe4899341d777f6da8fdd2026ca31df676ccfa1 Darcy Laycock sutto@sutto.net