rumpy 0.9.14 → 0.9.15

data/lib/rumpy.rb

@@ -21,7 +21,7 @@ module Rumpy
       file.puts pid
     end
     true
-  end
+  end # def self.start(botclass)
 
   # Determine the name of pid_file, read pid from this file
   # and try to kill process with this pid
@@ -36,7 +36,7 @@ module Rumpy
       File.unlink pf
     end
     true
-  end
+  end # def self.stop(botclass)
 
   # Create new instance of `botclass` and start it without detaching
   def self.run(botclass)
@@ -72,12 +72,9 @@ module Rumpy
       end
 
       @logger.info 'starting bot'
-      @logger.debug 'initializing some variables'
       init
-      @logger.debug 'establishing xmpp connection'
       connect
-      @logger.debug 'clear wrong users'
-      clear_users
+      prepare_users
 
       set_subscription_callback
       set_message_callback
@@ -89,31 +86,12 @@ module Rumpy
       @client.send Jabber::Presence.new.set_priority(@priority).set_status(@status)
 
       Thread.stop
-    end
+    end # def start
 
     private
 
-    def start_backend_thread
-      Thread.new do
-        begin
-          loop do
-            backend_func().each do |result|
-              send_msg *result
-            end
-          end
-        rescue ActiveRecord::StatementInvalid
-          @logger.warn 'Statement Invalid catched'
-          @logger.info 'Reconnecting to database'
-          reconnect_db!
-          retry
-        rescue => e
-          $logger.error e.inspect
-          $logger.error e.backtrace
-        end
-      end if self.respond_to? :backend_func
-    end
-
     def init
+      @logger.debug 'initializing some variables'
 
       xmppconfig  = YAML::load_file @config_path + '/xmpp.yml'
       @logger.info 'loaded xmpp.yml'
@@ -145,131 +123,171 @@ module Rumpy
       def @main_model.find_by_jid(jid)
         super jid.strip.to_s
       end
-    end
+
+      @queues = Hash.new do |h, k|
+        h[k]  = Queue.new
+      end
+    end # def init
 
     def connect
+      @logger.debug 'establishing xmpp connection'
+
       @client.connect
       @client.auth @password
       @roster = Jabber::Roster::Helper.new @client
       @roster.wait_for_roster
+
       @logger.info 'xmpp connection established'
     end
 
-    def clear_users
-      @main_model.find_each do |user|
-        items = @roster.find user.jid
-        if items.count.zero? then
-          @logger.info "deleting from database user with jid #{user.jid}"
-          user.destroy
-        end
-      end
+    def prepare_users
+      @logger.debug 'clear wrong users'
+
       @roster.items.each do |jid, item|
-        user = find_user_by_jid jid
-        if user.nil? then
+        user = @main_model.find_by_jid jid
+        if user.nil? or item.subscription != :both then
           @logger.info "deleting from roster user with jid #{jid}"
           item.remove
-        elsif item.subscription != :both then
-          @logger.info "deleting from roster&database user with jid #{jid}"
-          item.remove
+        end
+      end
+      @main_model.find_each do |user|
+        items = @roster.find user.jid
+        if items.empty? then
+          @logger.info "deleting from database user with jid #{user.jid}"
           user.destroy
+        else
+          start_user_thread user.jid
         end
       end
+
       @main_model.connection_pool.release_connection
-    end
+    end # def prepare_users
 
     def set_subscription_callback
       @roster.add_subscription_request_callback do |item, presence|
         jid = presence.from
         @roster.accept_subscription jid
-        @client.send Jabber::Presence.new.set_type(:subscribe).set_to(jid)
-        send_msg jid, @lang['hello']
-        @logger.info "#{jid} wanna subscribe"
+        send_msg presence.answer.set_type :subscribe
+        send_msg Jabber::Message.new(jid, @lang['hello']).set_type :chat
+
+        @logger.info "#{jid} just subscribed"
       end
       @roster.add_subscription_callback do |item, presence|
         begin
           case presence.type
           when :unsubscribed, :unsubscribe
             @logger.info "#{item.jid} wanna unsubscribe"
+            @queues[item.jid.strip.to_s].enq :unsubscribe
             item.remove
-            remove_jid item.jid
           when :subscribed
             add_jid item.jid
-            send_msg item.jid, @lang['authorized']
+            send_msg Jabber::Message.new(item.jid, @lang['authorized']).set_type :chat
           end
         rescue ActiveRecord::StatementInvalid
           @logger.warn 'Statement Invalid catched'
           @logger.info 'Reconnecting to database'
-          reconnect_db!
+          @main_model.connection.reconnect!
           retry
         end
       end
-    end
-
-    def find_user_by_jid(jid)
-      @main_model.find_by_jid jid
-    end
-
-    def reconnect_db!
-      @main_model.connection.reconnect!
-    end
+    end # def set_subscription_callback
 
     def set_message_callback
       @client.add_message_callback do |msg|
-        begin
-          if msg.type != :error and msg.body and msg.from then
-            if user = find_user_by_jid(msg.from) then
-              @logger.debug "get normal message from #{msg.from}"
-              pars_results = parser_func msg.body
-              @logger.debug "parsed message: #{pars_results.inspect}"
-
-              message = do_func user, pars_results
-              send_msg msg.from, message
-            else
-              @logger.debug "uknown user #{msg.from}"
-              send_msg msg.from, @lang['stranger']
-              items = @roster.find msg.from.strip.to_s
-              items.first.last.remove unless items.empty?
-            end
-          end
-        rescue ActiveRecord::StatementInvalid
-          @logger.warn 'Statement Invalid catched!'
-          @logger.info 'Reconnecting to database'
-          reconnect_db!
-          retry
-        rescue => e
-          @logger.error e.inspect
-          @logger.error e.backtrace
-        end
-      end
-    end
+        if msg.type != :error and msg.body and msg.from then
+          if @roster[msg.from] and @roster[msg.from].subscription == :both then
+            @logger.debug "got normal message from #{msg.from}"
+
+            @queues[msg.from.strip.to_s].enq msg
+          else # if @roster[msg.from] and @roster[msg.from].subscription == :both
+            @logger.debug "user not in roster: #{msg.from}"
+
+            send_msg msg.answer.set_body @lang['stranger']
+          end # if @roster[msg.from] and @roster[msg.from].subscription == :both
+        end # if msg.type != :error and msg.body and msg.from
+      end # @client.add_message_callback
+    end # def set_message_callback
 
     def set_iq_callback
       @client.add_iq_callback do |iq|
-        @logger.debug "got iq #{iq.inspect}"
+        @logger.debug "got iq #{iq}"
         if iq.type == :get then # hack for pidgin (STOP USING IT)
-          response = Jabber::Iq.new :error, iq.from
-          response.id = iq.id
-          if iq.elements["time"] == "<time xmlns='urn:xmpp:time'/>" then
+          response = iq.answer true
+          if iq.elements['time'] == "<time xmlns='urn:xmpp:time'/>" then
             @logger.debug 'this is time request, okay'
             response.set_type :result
-            response.root.add REXML::Element.new('time')
-            response.elements['time'].attributes['xmlns'] = 'urn:xmpp:time'
             tm = Time.now
             response.elements['time'].add REXML::Element.new('tzo')
             response.elements['time/tzo'].text = tm.xmlschema[-6..-1]
             response.elements['time'].add REXML::Element.new('utc')
             response.elements['time/utc'].text = tm.utc.xmlschema
-           end
-          @logger.debug "sending response: #{response}"
-          @client.send response
+          else
+            response.set_type :error
+          end # if iq.elements['time']
+          send_msg response
         end
       end
-    end
+    end # def set_iq_callback
 
-    def send_msg(destination, text)
-      return if destination.nil? or text.nil?
-      msg = Jabber::Message.new destination, text
-      msg.type = :chat
+    def start_backend_thread
+      Thread.new do
+        begin
+          loop do
+            backend_func().each do |result|
+              send_msg Jabber::Message.new(*result).set_type :chat
+            end
+          end
+        rescue ActiveRecord::StatementInvalid
+          @logger.warn 'Statement Invalid catched'
+          @logger.info 'Reconnecting to database'
+          @main_model.connection.reconnect!
+          retry
+        rescue => e
+          $logger.error e.inspect
+          $logger.error e.backtrace
+        end # begin
+      end if self.respond_to? :backend_func
+    end # def start_backend_thread
+
+    def start_user_thread(userjid)
+      Thread.new(userjid) do |userjid|
+        loop do
+          msg = @queues[userjid].deq
+
+          begin
+            if msg == :unsubscribe then
+              remove_jid userjid
+              break
+            end
+
+            user = @main_model.find_by_jid msg.from
+
+            pars_results = parser_func msg.body
+            @logger.debug "parsed message: #{pars_results.inspect}"
+            send_msg msg.answer.set_body do_func(user, pars_results)
+          rescue ActiveRecord::StatementInvalid
+            @logger.warn 'Statement Invalid catched!'
+            @logger.info 'Reconnecting to database'
+            @main_model.connection.reconnect!
+            retry
+          rescue ActiveRecord::ConnectionTimeoutError
+            @logger.warn 'ActiveRecord::ConnectionTimeoutError'
+            @logger.info 'sleep and retry again'
+            sleep 3
+            retry
+          rescue => e
+            @logger.error e.inspect
+            @logger.error e.backtrace
+          end # begin
+
+          @main_model.connection_pool.release_connection
+        end # loop do
+        Thread.current.join
+      end # Thread.new do
+    end # def start_user_thread(queue)
+
+    def send_msg(msg)
+      return if msg.nil?
       @logger.debug "sending message: #{msg}"
       @client.send msg
     end
@@ -278,6 +296,7 @@ module Rumpy
       user = @main_model.new
       user.jid = jid.strip.to_s
       user.save
+      start_user_thread user.jid
       @logger.info "added new user: #{jid}"
     end
 
@@ -285,8 +304,11 @@ module Rumpy
       user = @main_model.find_by_jid jid
       unless user.nil?
         @logger.info "removing user #{jid}"
+
+        @queues.delete user.jid
+
         user.destroy
       end
     end
-  end
-end
+  end # module Rumpy::Bot
+end # module Rumpy

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rumpy
 version: !ruby/object:Gem::Version 
-  hash: 39
+  hash: 37
   prerelease: false
   segments: 
   - 0
   - 9
-  - 14
-  version: 0.9.14
+  - 15
+  version: 0.9.15
 platform: ruby
 authors: 
 - Tsokurov A.G.
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-14 00:00:00 +03:00
+date: 2011-08-15 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency