omnibot 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 465f87c9979e343517e0f221dabedcbcac84d15f
-  data.tar.gz: 5c1a5bd12cb86e83df8d2f8c683fcc221831d8e4
+  metadata.gz: 420769502e3d02ff10e46d8f35ebe5d9e58e204e
+  data.tar.gz: c3f3c964d5aeceaa6db8fc4bcd57003d3886c6be
 SHA512:
-  metadata.gz: 75137c71b758d1d5290c72643b2ff32c477300f0cfd995357c7ae0ce0405ce8204a72844b889fbdf1e9f621e40222d737b99b74667745de58d6ab4e477471837
-  data.tar.gz: 12bedd9e3751ba3214b69973520e41df70555290e6d66cdd0fa94f9716846db0f897bedd1f93493fe88fcce18f77f9f9ca5d565e3e119a49f72ced6fa025a95f
+  metadata.gz: b9adb175015c16571bd145838e1a1c743196453f49346e1f00c67ede9d48d99a97f03d0409191d4b517c7e9fa06099ca7d2111139cac562e816e193569c252dd
+  data.tar.gz: bf4820829a12830951f963eb8c9a617a831f711328ad419c7db7a69a1854267da647ede463d5f7d4a00b9be157aefed9ac3a1acdcd5828cb4fac4f5b976e2d67

data/Rakefile

@@ -1 +1 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'

data/examples/command_mail.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 # You can specify this script in ~/.forward for mail forwarding
-IO.popen('omnisend','w') do |io|
-	IO.new(STDIN.fileno, 'r:UTF-8').each { |s| io.write s }
+IO.popen('omnisend', 'w') do |io|
+  IO.new(STDIN.fileno, 'r:UTF-8').each { |s| io.write s }
 end

data/lib/omnibot.rb

@@ -14,48 +14,47 @@ require 'sqlite3'
 require 'socket'
 require 'date'
 require 'tmpdir'
+require 'retryable'
 
-require "xray/thread_dump_signal_handler"
+require 'xray/thread_dump_signal_handler'
 
 # patch from https://github.com/ln/xmpp4r/issues/3
 
-if RUBY_VERSION < "1.9"
+if RUBY_VERSION < '1.9'
 # ...
 else
-	# Encoding patch
-	require 'socket'
-	class TCPSocket
-		def external_encoding
-			Encoding::BINARY
-		end
-	end
-
-	require 'rexml/source'
-	class REXML::IOSource
-		alias_method :encoding_assign, :encoding=
-			def encoding=(value)
-				encoding_assign(value) if value
-			end
-	end
-
-	begin
-		# OpenSSL is optional and can be missing
-		require 'openssl'
-		class OpenSSL::SSL::SSLSocket
-			def external_encoding
-				Encoding::BINARY
-			end
-		end
-	rescue
-	end
+  # Encoding patch
+  require 'socket'
+  class TCPSocket
+    def external_encoding
+      Encoding::BINARY
+    end
+  end
+
+  require 'rexml/source'
+  class REXML::IOSource
+    alias_method :encoding_assign, :encoding=
+    def encoding=(value)
+      encoding_assign(value) if value
+    end
+  end
+
+  begin
+    # OpenSSL is optional and can be missing
+    require 'openssl'
+    class OpenSSL::SSL::SSLSocket
+      def external_encoding
+        Encoding::BINARY
+      end
+    end
+  rescue # rubocop:disable Lint/HandleExceptions
+  end
 end
 
 # -----------------
 
 module OmniBot
-
-	%w[ helpers jabberbot amqpconsumer omnisend launcher loggedcommand periodiccommand mailchecker ].each do |file|
-		require "omnibot/#{file}.rb"
-	end
-
+  %w( helpers jabberbot amqpconsumer omnisend launcher loggedcommand periodiccommand mailchecker ).each do |file|
+    require "omnibot/#{file}.rb"
+  end
 end

data/lib/omnibot/amqpconsumer.rb

@@ -1,76 +1,76 @@
 # encoding: utf-8
 
 module OmniBot
-
-	# AMQP consumer class
-	class AMQPConsumer
-
-		attr_accessor :handlers
-		attr_accessor :db
-
-		def send_message message
-			begin
-				@omnibot.add_message [Time.now, message]
-			rescue Object => e
-				OmniLog::error "Sending message error: #{e.message}\ntrace:\n#{Helpers::backtrace e}\nIgnoring..."
-			end
-		end
-
-		def initialize config
-			@config = config
-		end
-
-		def amqp_loop
-			AMQP.start do |connection|
-				OmniLog::info "Setup amqp gem #{AMQP::VERSION}, AMQP protocol #{AMQ::Protocol::VERSION}..."
-				mq = AMQP::Channel.new(connection)
-				exchange = mq.direct(Helpers::amqp_exchange_name)
-				queue = mq.queue('', :exclusive => true).bind(exchange, :routing_key => Helpers::amqp_routing_key)
-
-				OmniLog::info "Setup omnibot..."
-				@omnibot = JabberBot.new(Jabber::JID::new(@config['omnibotuser']), @config['omnibotpass'])
-				@omnibot.timer_provider = EM
-				@omnibot.set_subscriber Jabber::JID::new(@config['notifyjid']), @config['notifyresource']
-				@omnibot.connect
-
-				@handlers.each_with_index do |handler, index|
-					OmniLog::info "Setup handler #{handler.to_s}..."
-					handler.timer_provider = EM
-					handler.set_jabber_messenger { |message| send_message message }
-					handler.startup_pause = index*10
-					handler.start
-				end
-			
-				OmniLog::info "==== AMQP is ready ===="
-
-				queue.subscribe do |msg|
-					message = Marshal.load(Base64.decode64(msg)).force_encoding('UTF-8')
-					send_message message
-				end
-
-			end
-
-		# it is a function rescue block, don't be afraid
-		rescue => e
-			OmniLog::error "AMQP/Jabber setup error: #{e.message}\ntrace:\n#{Helpers::backtrace e}\nExiting..."
-			AMQP.stop{ EM.stop }
-		end
-
-		# Main AMQP loop
-		def start 
-			
-			# exit hook
-			Signal.trap('INT') do
-				OmniLog::info "It's a trap, should exit..."
-				AMQP.stop{ EM.stop }
-			end
-
-			amqp_loop
-			
-			OmniLog::info "Exited"
-		end
-
-	end
-
+  # AMQP consumer class
+  class AMQPConsumer
+    attr_accessor :handlers
+    attr_accessor :db
+
+    def send_message(message)
+      @omnibot.add_message [Time.now, message]
+    rescue Object => e
+      OmniLog::error "Sending message error: #{e.message}\ntrace:\n#{Helpers::backtrace e}\nIgnoring..."
+    end
+
+    def initialize(config)
+      @config = config
+    end
+
+    def amqp_loop
+      AMQP.start do |connection|
+        OmniLog::info "Setup amqp gem #{AMQP::VERSION}, AMQP protocol #{AMQ::Protocol::VERSION}..."
+
+        connection.on_tcp_connection_loss do |conn, _settings|
+          OmniLog::info '[network failure] Trying to reconnect...'
+          conn.reconnect(false, 30)
+        end
+
+        mq = AMQP::Channel.new(connection)
+        exchange = mq.direct(Helpers::amqp_exchange_name)
+        queue = mq.queue('', exclusive: true).bind(exchange, routing_key: Helpers::amqp_routing_key)
+
+        OmniLog::info 'Setup omnibot...'
+        @omnibot = JabberBot.new(Jabber::JID::new(@config['omnibotuser']), @config['omnibotpass'])
+        @omnibot.timer_provider = EM
+        @omnibot.set_subscriber Jabber::JID::new(@config['notifyjid']), @config['notifyresource']
+        @omnibot.connect
+
+        @handlers.each_with_index do |handler, index|
+          OmniLog::info "Setup handler #{handler}..."
+          handler.timer_provider = EM
+          handler.jabber_messenger { |message| send_message message }
+          handler.startup_pause = index * 10
+          handler.start
+        end
+
+        OmniLog::info '==== AMQP is ready ===='
+
+        queue.subscribe do |msg|
+          message = Marshal.load(Base64.decode64(msg)).force_encoding('UTF-8')
+          send_message message
+        end
+      end
+    end
+
+    # Main AMQP loop
+    def start
+      # exit hook
+      Signal.trap('INT') do
+        OmniLog::info "It's a trap, should exit..."
+        AMQP.stop { EM.stop }
+      end
+
+      begin
+        exception_cb = proc { |e| OmniLog::error "Cannot connect to AMQP: #{e.message}" }
+        Retryable.retryable(tries: 5, sleep: ->(n) { 3**n }, exception_cb: exception_cb, on: AMQP::TCPConnectionFailed) do
+          amqp_loop
+        end
+      rescue => e
+        OmniLog::error "AMQP/Jabber setup error: #{e.message}\ntrace:\n#{Helpers::backtrace e}\nExiting..."
+        AMQP.stop { EM.stop }
+      end
+
+      OmniLog::info 'Exited'
+    end
+  end
 end
-

data/lib/omnibot/helpers.rb

@@ -1,71 +1,71 @@
 # encoding: utf-8
 
 module OmniBot
+  class OmniLog
+    def self.init_log
+      logger = Logger.new('omnibot.log')
+      logger.level = Logger::DEBUG
+      logger
+    end
 
-	class OmniLog
-
-		def self.init_log
-			logger = Logger.new('omnibot.log')
-			logger.level = Logger::DEBUG
-			logger
-		end
-			
-		def self.log=(value)
-			@logger = value
-		end
-
-		def self.log
-			@logger
-		end
-
-		def self.debug(progname = nil, &block); @logger.debug(progname, &block); end
-		def self.info(progname = nil, &block); @logger.info(progname, &block); end
-		def self.warn(progname = nil, &block); @logger.warn(progname, &block); end
-		def self.error(progname = nil, &block); @logger.error(progname, &block); end
-		def self.fatal(progname = nil, &block); @logger.fatal(progname, &block); end
-	end
-
-	# Helper class for counting reconnect attempts
-	class AttemptCounter
-		def report
-			OmniLog::debug "AttemptCounter: try #{@counter} of #{@max_attempts}"
-		end
-	public
-		def initialize max_attempts
-			@counter = 0
-			@max_attempts = max_attempts
-			OmniLog::debug "AttemptCounter inited"
-		end
-
-		def out_of_attempts?
-			@counter >= @max_attempts
-		end
-
-		def increase
-			@counter += 1
-			report
-		end
-	end
-
-	class Helpers
-		def self.backtrace e
-			e.respond_to?(:backtrace) && e.backtrace ? e.backtrace.join("\n\t") : ""
-		end
-		
-		def self.same_day? t1, t2
-			t1.year == t2.year && t1.month == t2.month && t1.day == t2.day
-		end
-
-		def self.amqp_exchange_name
-			'omnibot-exchange'
-		end
-		
-		def self.amqp_routing_key
-			'omnibot-routing'
-		end
-
-	end
+    def self.log=(value)
+      @logger = value
+    end
 
-end
+    def self.log
+      @logger
+    end
+
+    def self.debug(progname = nil, &block); @logger.debug(progname, &block); end
+
+    def self.info(progname = nil, &block); @logger.info(progname, &block); end
+
+    def self.warn(progname = nil, &block); @logger.warn(progname, &block); end
+
+    def self.error(progname = nil, &block); @logger.error(progname, &block); end
+
+    def self.fatal(progname = nil, &block); @logger.fatal(progname, &block); end
+  end
+
+  # Helper class for counting reconnect attempts
+  class AttemptCounter
+    def report
+      OmniLog::debug "AttemptCounter: try #{@counter} of #{@max_attempts}"
+    end
 
+    public
 
+    def initialize(max_attempts)
+      @counter = 0
+      @max_attempts = max_attempts
+      OmniLog::debug 'AttemptCounter inited'
+    end
+
+    def out_of_attempts?
+      @counter >= @max_attempts
+    end
+
+    def increase
+      @counter += 1
+      report
+    end
+  end
+
+  class Helpers
+    def self.backtrace(e)
+      e.respond_to?(:backtrace) && e.backtrace ? e.backtrace.join("\n\t") : ''
+    end
+
+    def self.same_day?(t1, t2)
+      t1.year == t2.year && t1.month == t2.month && t1.day == t2.day
+    end
+
+    def self.amqp_exchange_name
+      'omnibot-exchange'
+    end
+
+    def self.amqp_routing_key
+      'omnibot-routing'
+    end
+  end
+end

data/lib/omnibot/jabberbot.rb

@@ -1,209 +1,202 @@
 # encoding: utf-8
 
 module OmniBot
-
-	# Jabber bot with reconnection and dnd-care logic
-	class JabberBot
-
-		def dump_presence p
-			p ? "Presence status=#{p.status} type=#{p.type} show=#{p.show} from=#{p.from} to=#{p.to} xml=(#{p.to_s})" : "nil"
-		end
-
-		def on_message_handler m
-			OmniLog::debug "Got jabber message from #{m.from}:\n#{m.body}\n."
-		end
-
-		def is_needed_user? jid
-			jid.strip == @subscriber && @subscriber_resource.match((jid.resource or ''))
-		end
-
-		def on_presence_callback old_presence, new_presence
-			OmniLog::debug "Presence changed:\n...old #{dump_presence old_presence}\n...new #{dump_presence new_presence}"
-			if is_needed_user? old_presence.from
-				@subscriber_online = check_presence? old_presence
-				@subscriber_concrete_jid = old_presence.from
-				OmniLog::debug "Subscriber #{@subscriber} is #{@subscriber_online ? "ready" : "not ready"}"
-				pump_messages if @subscriber_online
-
-				unless @greeting_done
-					@greeting_done = true
-					add_message [Time.now, 'Hello, I am online']
-				end
-			end
-		end
-
-		def on_subscripton_request_callback item, pres
-			OmniLog::debug "Subscription request item=#{item} pres=#{dump_presence pres}"
-		end
-
-		def on_exception_handler e, stream, sym_where
-			OmniLog::error "Jabber exception of #{e ? e.class : nil} happens at symbol \"#{sym_where}\": #{e}\nbacktrace\n#{Helpers::backtrace e}"
-			OmniLog::debug "stream is #{stream} vs client #{@client}"
-			on_generic_exception_handler e
-		end
-
-		def safe_reconnect
-			begin
-				reconnect
-			rescue Jabber::ClientAuthenticationFailure => e
-				OmniLog::error "Authentification error: #{e.class}: #{e}"
-				raise 
-			rescue Exception => e
-				OmniLog::error "Reconnect hard error: #{e.class}: #{e}"
-				on_generic_exception_handler e
-			end
-		end
-
-		def on_generic_exception_handler e
-			if e && (e.kind_of?(Jabber::ServerDisconnected) || e.class.to_s =~ /^Errno::.+/ || e.kind_of?(SocketError))
-				OmniLog::warn "Looking to error, ign=#{@ignore_reconnect}, tp=#{@timer_provider}"
-				OmniLog::error "No timer provider assigned" unless @timer_provider
-				# attempt counter is set when it's needed to connect
-				unless @ignore_reconnect
-					@timer_provider.add_timer(@reconnect_pause) { try_reconnect }
-				end
-			else
-				OmniLog::warn "Ignoring error #{e}"
-			end
-		end
-
-		def reconnect
-			OmniLog::debug 'Going to reconnect'
-			@client.connect
-			@client.auth(@password)
-			@client.send(Jabber::Presence.new.set_type(:available))
-		end
-
-		def try_reconnect
-			OmniLog::debug "Called try_reconnect, #{@client.inspect}, #{@client.is_connected?}"
-			return if @client.is_connected?
-
-			OmniLog::debug 'Called try_reconnect'
-			
-			@attempt_counter = AttemptCounter.new(5) unless @attempt_counter
-			@attempt_counter.increase
-
-			if @attempt_counter.out_of_attempts?
-				OmniLog::warn "Can't reconect too often, sleep for #{@reconnect_long_pause/60} minutes..."
-				@attempt_counter = nil
-				@ignore_reconnect = true
-				@timer_provider.add_timer(@reconnect_long_pause) {
-					@ignore_reconnect = false
-					try_reconnect
-				}
-				return 
-			end
-				
-			safe_reconnect
-
-			if @client.is_connected?
-				@attempt_counter = nil
-				@roster = Jabber::Roster::Helper.new(@client)
-				@roster.add_subscription_request_callback { |item, pres| on_subscripton_request_callback item, pres }
-			end
-
-			OmniLog::debug "Client #{@client.is_connected? ? 'is' : 'isn\'t'} connected"
-		end
-
-		def check_presence? presence
-			raise 'No subscriber' unless @subscriber
-
-			if presence.type == nil
-				OmniLog::debug "Subscriber status #{presence.show ? presence.show : 'online'}"
-				return presence.show == nil || presence.show == :chat
-			elsif presence.type == :unavailable
-				OmniLog::debug "Subscriber goes offline"
-				return false
-			else
-				return false
-			end
-		end
-
-		def say_when_human orig, now
-			if Helpers::same_day? now, orig
-				amount = now - orig
-				if amount < 60
-					return "just now"
-				elsif amount < 60*60
-					return "less than a hour ago"
-				elsif amount < 60*60*2
-					return " two hours ago"
-				elsif amount < 60*60*6
-					return amount.div(3600).to_s + " hours ago"
-				end
-			end
-			return orig.to_s
-		end
-
-
-		def pump_messages
-			while msg = @messages.shift
-				send msg
-			end
-		end
-
-	public
-
-		attr_writer :timer_provider
-
-		def initialize jid, password
-			@client = Jabber::Client::new(jid)
-			@password = password
-			raise 'No jid set' if jid.empty?
-			raise 'No password set' unless password 
-
-			@ignore_reconnect = false
-			@reconnect_pause = 10
-			@reconnect_long_pause = 60*15
-
-			@messages = []
-			@subscriber_online = false
-			@subscriber_concrete_jid = nil
-
-			@client.on_exception { |e, stream, sym_where| on_exception_handler(e, stream, sym_where) }
-			@client.add_message_callback { |m| on_message_handler m }
-			@client.add_presence_callback { |from, to| on_presence_callback from, to }
-		end
-
-		def connect
-			try_reconnect
-		end
-
-		def disconnect
-			@client.close
-		end
-
-		def set_subscriber jid, resource=nil
-			@subscriber = jid
-			if resource == nil || resource == ''
-				@subscriber_resource = /.*/
-			else
-				@subscriber_resource = Regexp.new(resource)
-			end
-		end
-
-		def add_message message
-			OmniLog::debug "Register a message, " + (@subscriber_online ? "should send immediately" : "will send later")
-			@messages << message
-			pump_messages if @subscriber_online
-		end
-
-		def send message
-			raise 'Not connected' unless @client.is_connected?
-			raise 'No concrete jid' unless @subscriber_concrete_jid
-
-			OmniLog::info "Sending a message..."
-			orig = message[0]
-			content = message[1]
-
-			body = "Omnibot reported " + say_when_human(orig, Time.now) + ":\n" + content.to_s
-			OmniLog::debug body
-
-			msg = Jabber::Message::new(@subscriber_concrete_jid, body)
-			msg.type = :chat
-			@client.send(msg)
-		end
-	end
-
+  # Jabber bot with reconnection and dnd-care logic
+  class JabberBot
+    def dump_presence(p)
+      p ? "Presence status=#{p.status} type=#{p.type} show=#{p.show} from=#{p.from} to=#{p.to} xml=(#{p})" : 'nil'
+    end
+
+    def on_message_handler(m)
+      OmniLog::debug "Got jabber message from #{m.from}:\n#{m.body}\n."
+    end
+
+    def needed_user?(jid)
+      jid.strip == @subscriber && @subscriber_resource.match((jid.resource || ''))
+    end
+
+    def on_presence_callback(old_presence, _new_presence)
+      # OmniLog::debug "Presence changed:\n...old #{dump_presence old_presence}\n...new #{dump_presence new_presence}"
+      return unless needed_user? old_presence.from
+      @subscriber_online = check_presence? old_presence
+      @subscriber_concrete_jid = old_presence.from
+      OmniLog::debug "Subscriber #{@subscriber} is #{@subscriber_online ? 'ready' : 'not ready'}"
+      pump_messages if @subscriber_online
+
+      unless @greeting_done
+        @greeting_done = true
+        add_message [Time.now, 'Hello, I am online']
+      end
+    end
+
+    def on_subscripton_request_callback(item, pres)
+      OmniLog::debug "Subscription request item=#{item} pres=#{dump_presence pres}"
+    end
+
+    def on_exception_handler(e, stream, sym_where)
+      OmniLog::error "Jabber exception of #{e ? e.class : nil} happens at symbol \"#{sym_where}\": #{e}\nbacktrace\n#{Helpers::backtrace e}"
+      OmniLog::debug "stream is #{stream} vs client #{@client}"
+      on_generic_exception_handler e
+    end
+
+    def safe_reconnect
+      reconnect
+    rescue Jabber::ClientAuthenticationFailure => e
+      OmniLog::error "Authentification error: #{e.class}: #{e}"
+      raise
+    rescue Exception => e # rubocop:disable Lint/RescueException
+      # needed to handle all errors from xmpp
+      OmniLog::error "Reconnect hard error: #{e.class}: #{e}"
+      on_generic_exception_handler e
+    end
+
+    def on_generic_exception_handler(e)
+      if e && (e.is_a?(Jabber::ServerDisconnected) || e.class.to_s =~ /^Errno::.+/ || e.is_a?(SocketError))
+        OmniLog::warn "Looking to error, ign=#{@ignore_reconnect}, tp=#{@timer_provider}"
+        OmniLog::error 'No timer provider assigned' unless @timer_provider
+        # attempt counter is set when it's needed to connect
+        unless @ignore_reconnect
+          @timer_provider.add_timer(@reconnect_pause) { try_reconnect }
+        end
+      else
+        OmniLog::warn "Ignoring error #{e}"
+      end
+    end
+
+    def reconnect
+      OmniLog::debug 'Going to reconnect'
+      @client.connect
+      @client.auth(@password)
+      @client.send(Jabber::Presence.new.set_type(:available))
+    end
+
+    def try_reconnect
+      OmniLog::debug "Called try_reconnect, #{@client.inspect}, #{@client.is_connected?}"
+      return if @client.is_connected?
+
+      OmniLog::debug 'Called try_reconnect'
+
+      @attempt_counter = AttemptCounter.new(5) unless @attempt_counter
+      @attempt_counter.increase
+
+      if @attempt_counter.out_of_attempts?
+        OmniLog::warn "Can't reconect too often, sleep for #{@reconnect_long_pause / 60} minutes..."
+        @attempt_counter = nil
+        @ignore_reconnect = true
+        @timer_provider.add_timer(@reconnect_long_pause) do
+          @ignore_reconnect = false
+          try_reconnect
+        end
+        return
+      end
+
+      safe_reconnect
+
+      if @client.is_connected?
+        @attempt_counter = nil
+        @roster = Jabber::Roster::Helper.new(@client)
+        @roster.add_subscription_request_callback { |item, pres| on_subscripton_request_callback item, pres }
+      end
+
+      OmniLog::debug "Client #{@client.is_connected? ? 'is' : 'isn\'t'} connected"
+    end
+
+    def check_presence?(presence)
+      raise 'No subscriber' unless @subscriber
+
+      if presence.type.nil?
+        OmniLog::debug "Subscriber status #{presence.show ? presence.show : 'online'}"
+        return presence.show.nil? || presence.show == :chat
+      elsif presence.type == :unavailable
+        OmniLog::debug 'Subscriber goes offline'
+        return false
+      else
+        return false
+      end
+    end
+
+    def say_when_human(orig, now)
+      if Helpers::same_day? now, orig
+        amount = now - orig
+        if amount < 60
+          return 'just now'
+        elsif amount < 60 * 60
+          return 'less than a hour ago'
+        elsif amount < 60 * 60 * 2
+          return ' two hours ago'
+        elsif amount < 60 * 60 * 6
+          return amount.div(3600).to_s + ' hours ago'
+        end
+      end
+      orig.to_s
+    end
+
+    def pump_messages
+      while (msg = @messages.shift)
+        send msg
+      end
+    end
+
+    public
+
+    attr_writer :timer_provider
+
+    def initialize(jid, password)
+      @client = Jabber::Client::new(jid)
+      @password = password
+      raise 'No jid set' if jid.empty?
+      raise 'No password set' unless password
+
+      @ignore_reconnect = false
+      @reconnect_pause = 10
+      @reconnect_long_pause = 60 * 15
+
+      @messages = []
+      @subscriber_online = false
+      @subscriber_concrete_jid = nil
+
+      @client.on_exception { |e, stream, sym_where| on_exception_handler(e, stream, sym_where) }
+      @client.add_message_callback { |m| on_message_handler m }
+      @client.add_presence_callback { |from, to| on_presence_callback from, to }
+    end
+
+    def connect
+      try_reconnect
+    end
+
+    def disconnect
+      @client.close
+    end
+
+    def set_subscriber(jid, resource = nil)
+      @subscriber = jid
+      if resource.nil? || resource == ''
+        @subscriber_resource = /.*/
+      else
+        @subscriber_resource = Regexp.new(resource)
+      end
+    end
+
+    def add_message(message)
+      OmniLog::debug 'Register a message, ' + (@subscriber_online ? 'should send immediately' : 'will send later')
+      @messages << message
+      pump_messages if @subscriber_online
+    end
+
+    def send(message)
+      raise 'Not connected' unless @client.is_connected?
+      raise 'No concrete jid' unless @subscriber_concrete_jid
+
+      OmniLog::info 'Sending a message...'
+      orig = message[0]
+      content = message[1]
+
+      body = 'Omnibot reported ' + say_when_human(orig, Time.now) + ":\n" + content.to_s
+      OmniLog::debug body
+
+      msg = Jabber::Message::new(@subscriber_concrete_jid, body)
+      msg.type = :chat
+      @client.send(msg)
+    end
+  end
 end
-