em-xmpp 0.0.11 → 0.0.12

data/lib/em-xmpp/evented.rb

@@ -0,0 +1,183 @@
+
+require 'em-xmpp/namespaces'
+require 'em-xmpp/entity'
+require 'em-xmpp/handler'
+require 'em-xmpp/xml_builder'
+require 'em-xmpp/xml_parser'
+require 'em-xmpp/cert_store'
+require 'fiber'
+
+module EM::Xmpp
+  module Evented
+    include Namespaces
+    include XmlBuilder
+    include XmlParser
+    def component?
+      @component
+    end
+
+    def jid_received(jid)
+      @jid = entity jid
+    end
+
+    def entity(jid)
+      Entity.new(self, jid)
+    end
+
+    def default_presence_params
+      {}
+    end
+
+    def default_message_params
+      {'to' => @jid.domain, 'id' => "em-xmpp.#{rand(65535)}"}
+    end
+
+    def default_iq_params
+      {'type' => 'get', 'id' => "em-xmpp.#{rand(65535)}"}
+    end
+
+    def presence_stanza(*args,&blk)
+      OutgoingStanza.new('presence', default_presence_params, *args,&blk)
+    end
+
+    def message_stanza(*args,&blk)
+      OutgoingStanza.new('message',default_message_params,*args,&blk)
+    end
+
+    def iq_stanza(*args,&blk)
+      OutgoingStanza.new('iq', default_iq_params, *args,&blk)
+    end
+
+    def send_stanza(stanza)
+      send_raw stanza.xml
+      if block_given?
+        upon(:anything) do |ctx|
+          if ctx.bit(:stanza).id == stanza.params['id']
+            yield ctx
+            ctx.delete_xpath_handler!
+          else
+            ctx
+          end
+        end
+      end
+    end
+
+    %w{upon on on_exception on_presence on_iq on_message on_decorator on_iq_decorator on_presence_decorator on_message_decorator}.each do |meth|
+      define_method(meth) do |*args,&blk|
+      @handler.send meth, *args, &blk
+      end
+    end
+
+
+    # XML (stanzas) stream
+
+    def ready
+    end
+
+    def stream_start(node)
+    end
+
+    def stanza_start(node)
+    end
+
+    def stanza_end(node)
+      Fiber.new { @handler.handle(node) }.resume
+    end
+
+    def unhandled_stanza(node)
+      raise RuntimeError, "did not handle node:\n#{node}"
+    end
+
+    def ssl_verify_peer(pem)
+      @certstore.trusted?(pem).tap do |trusted|
+        close_connection unless trusted
+      end    
+    end
+
+    def receive_raw(dat)
+      @xml_parser << dat
+    end
+
+    def prepare_parser!
+      @xml_parser   = ForwardingParser.new self
+      @stack        = []
+      @stanza       = nil
+      @streamdoc    = nil
+
+      open_xml_stream
+    end
+
+    def restart_xml_stream
+      #make sure we stop receiving methods from the old parser
+      @xml_parser.document.recipient = nil 
+      prepare_parser!
+    end
+
+    def send_xml(*args)
+      send_raw build_xml(*args)
+    end
+
+    def set_negotiation_handler!
+      @handler = StreamNegotiation.new self
+    end
+
+    def negotiation_finished
+      @pass    = nil
+      @handler = Routine.new self
+      send_stanza presence_stanza() unless component?
+      framework_ready if respond_to? :framework_ready
+      ready
+    end
+
+    def negotiation_failed(node)
+      raise RuntimeError, "could not negotiate a stream:\n#{node}"
+    end
+
+    private
+
+    def open_xml_stream_tag
+      domain  = @jid.domain
+      version = '1.0'
+      lang    = 'en'
+      start_stream = <<-STREAM 
+                    <stream:stream
+                    to='#{domain}'
+                    version='#{version}'
+                    xml:lang='#{lang}'
+                    xmlns='#{Client}'
+                    xmlns:stream='#{Stream}'
+                    >
+      STREAM
+    end
+
+    def close_xml_stream_tag
+      '</stream:stream>'
+    end
+
+    def open_xml_stream
+      send_raw open_xml_stream_tag
+    end
+
+    def close_xml_stream
+      send_raw close_xml_stream_tag
+    end
+
+    public
+
+    ### TLS World
+
+    def ask_for_tls
+      send_xml('starttls', :xmlns => TLS)
+    end
+
+    def start_using_tls_and_reset_stream
+      initiate_tls
+      restart_xml_stream
+    end
+
+    def initiate_tls
+      raise NotImplementedError
+    end
+
+  end
+end

data/lib/em-xmpp/handler.rb

@@ -3,6 +3,7 @@ require 'em-xmpp/namespaces'
 require 'em-xmpp/context'
 require 'em-xmpp/stanza_matcher'
 require 'em-xmpp/stanza_handler'
+require 'em-xmpp/xml_builder'
 require 'base64'
 require 'sasl/base'
 require 'sasl'
@@ -10,14 +11,13 @@ require 'sasl'
 module EM::Xmpp
   class Handler
     include Namespaces
+		include XmlBuilder
 
     def initialize(conn)
       @connection         = conn
       @handlers           = []
       @decorator_handlers = []
       @exception_handlers = []
-
-      stack_decorators
     end
 
     # wraps the stanza in a context and calls handle_context
@@ -25,82 +25,82 @@ module EM::Xmpp
       handle_context Context.new(@connection, stanza)
     end
 
-    private
-
-    def stack_decorators
+    def enable_default_stack_decorators!
       on_presence_decorator do |ctx| 
-        presence = ctx.bit!(:presence) 
-        ctx.bit!(:error) if presence.error?
+        presence = ctx.bit(:presence) 
+        ctx.bit(:error) if presence.error?
         ctx
       end
       on_message_decorator  do |ctx| 
-        msg = ctx.bit!(:message) 
-        ctx.bit!(:error) if msg.error?
+        msg = ctx.bit(:message) 
+        ctx.bit(:error) if msg.error?
         ctx
       end
       on_iq_decorator       do |ctx| 
-        iq = ctx.bit!(:iq) 
-        ctx.bit!(:error) if iq.error?
+        iq = ctx.bit(:iq) 
+        ctx.bit(:error) if iq.error?
         ctx
       end
       on_decorator('//xmlns:pubsub', 'xmlns' => PubSub) do |ctx|
-        ctx.bit!(:pubsub)
+        ctx.bit(:pubsub)
         ctx
       end
       on_decorator('//xmlns:event', 'xmlns' => PubSubEvent) do |ctx|
-        ctx.bit!(:pubsubevent)
+        ctx.bit(:pubsubevent)
         ctx
       end
       on_decorator('//xmlns:delay', 'xmlns' => Delay) do |ctx|
-        ctx.bit!(:delay)
+        ctx.bit(:delay)
         ctx
       end
       on_decorator('//xmlns:query', 'xmlns' => DiscoverInfos) do |ctx|
-        ctx.bit!(:discoinfos)
+        ctx.bit(:discoinfos)
         ctx
       end
       on_decorator('//xmlns:query', 'xmlns' => DiscoverItems) do |ctx|
-        ctx.bit!(:discoitems)
+        ctx.bit(:discoitems)
         ctx
       end
       on_decorator('//xmlns:query', 'xmlns' => Roster) do |ctx|
-        ctx.bit!(:roster)
+        ctx.bit(:roster)
         ctx
       end
       on_decorator('//xmlns:command', 'xmlns' => Commands) do |ctx|
-        ctx.bit!(:command)
+        ctx.bit(:command)
         ctx
       end
       on_decorator('//xmlns:data', 'xmlns' => BoB) do |ctx|
-        ctx.bit!(:bob)
+        ctx.bit(:bob)
         ctx
       end
       on_decorator('//xmlns:x', 'xmlns' => DataForms) do |ctx|
-        ctx.bit!(:dataforms)
+        ctx.bit(:dataforms)
         ctx
       end
       on_decorator('//xmlns:nick', 'xmlns' => Nick) do |ctx|
-        ctx.bit!(:nickname)
+        ctx.bit(:nickname)
         ctx
       end
       on_decorator('//xmlns:x', 'xmlns' => MucUser) do |ctx|
-        ctx.bit!(:mucuser)
+        ctx.bit(:mucuser)
         ctx
       end
       on_decorator('//xmlns:si', 'xmlns' => StreamInitiation) do |ctx|
-        ctx.bit!(:streaminitiation)
+        ctx.bit(:streaminitiation)
         ctx
       end
       on_decorator('//xmlns:open | //xmlns:data | //xmlns:close', 'xmlns' => IBB) do |ctx|
-        ctx.bit!(:ibb)
+        ctx.bit(:ibb)
         ctx
       end
       on_decorator('//xmlns:query', 'xmlns' => ByteStreams) do |ctx|
-        ctx.bit!(:bytestreams)
+        ctx.bit(:bytestreams)
         ctx
       end
     end
 
+    private
+
     def add_decorator_handler(handler)
       @decorator_handlers << handler
     end
@@ -273,63 +273,73 @@ module EM::Xmpp
       on_exception(:anything) do |ctx|
         raise ctx['error']
       end
-      on('//xmlns:starttls', {'xmlns' => TLS}) do |ctx|
-        @connection.ask_for_tls 
-        ctx.delete_xpath_handler!.done!
-      end
 
-      on('//xmlns:proceed', {'xmlns' => TLS }) do |ctx|
-        @connection.start_using_tls_and_reset_stream
-        ctx.delete_xpath_handler!.done!
-      end
+      if @connection.component?
+        on('//xmlns:handshake', {}) do |ctx|
+          @connection.negotiation_finished
+          ctx.delete_xpath_handler!.done!
+        end
 
-      on('//xmlns:mechanisms', {'xmlns' => SASL}) do |ctx|
-        search = ctx.xpath('//xmlns:mechanisms', {'xmlns' => SASL})
-        if search.first
-          mechanisms = search.first.children.map(&:content)
-          start_sasl mechanisms
+      else
+        on('//xmlns:starttls', {'xmlns' => TLS}) do |ctx|
+          @connection.ask_for_tls
           ctx.delete_xpath_handler!.done!
-        else
-          raise RuntimeError, "how come there is no mechanism node?"
         end
-      end
 
-      on('//xmlns:challenge', {'xmlns' => SASL}) do |ctx|
-        sasl_step ctx.stanza
-        ctx.done!
-      end
+        on('//xmlns:proceed', {'xmlns' => TLS }) do |ctx|
+          @connection.start_using_tls_and_reset_stream
+          ctx.delete_xpath_handler!.done!
+        end
 
-      on('//xmlns:success', {'xmlns' => SASL}) do |ctx|
-        @connection.restart_xml_stream
-        ctx.delete_xpath_handler!.done!
-      end
+        on('//xmlns:mechanisms', {'xmlns' => SASL}) do |ctx|
+          search = ctx.xpath('//xmlns:mechanisms', {'xmlns' => SASL})
+          if search.first
+            mechanisms = search.first.children.map(&:content)
+            start_sasl mechanisms
+            ctx.delete_xpath_handler!.done!
+          else
+            raise RuntimeError, "how come there is no mechanism node?"
+          end
+        end
 
-      on('//xmlns:bind', {'xmlns' => Bind}) do |ctx|
-        bind_to_resource  
-        ctx.delete_xpath_handler!.done!
-      end
+        on('//xmlns:challenge', {'xmlns' => SASL}) do |ctx|
+          sasl_step ctx.stanza
+          ctx.done!
+        end
 
-      on('//xmlns:bind', {'xmlns' => Bind}) do |ctx|
-        jid  = extract_jid ctx.stanza
+        on('//xmlns:success', {'xmlns' => SASL}) do |ctx|
+          @connection.restart_xml_stream
+          ctx.delete_xpath_handler!.done!
+        end
 
-        if jid
-          @connection.jid_received jid 
-          start_session
-        else
-          raise RuntimeError, "no jid despite binding"
+        on('//xmlns:bind', {'xmlns' => Bind}) do |ctx|
+          bind_to_resource
+          ctx.delete_xpath_handler!.done!
         end
 
-        ctx.delete_xpath_handler!.done!
-      end
+        on('//xmlns:bind', {'xmlns' => Bind}) do |ctx|
+          jid  = extract_jid ctx.stanza
 
-      on('//xmlns:session', {'xmlns' => Session}) do |ctx|
-        @connection.negotiation_finished
-        ctx.delete_xpath_handler!.done!
-      end
+          if jid
+            @connection.jid_received jid
+            start_session
+          else
+            raise RuntimeError, "no jid despite binding"
+          end
+
+          ctx.delete_xpath_handler!.done!
+        end
+
+        on('//xmlns:session', {'xmlns' => Session}) do |ctx|
+          @connection.negotiation_finished
+          ctx.delete_xpath_handler!.done!
+        end
+
+        on('//xmlns:failure', {'xmlns' => SASL}) do |ctx|
+          @connection.negotiation_failed(ctx.stanza)
+          ctx.done!
+        end
 
-      on('//xmlns:failure', {'xmlns' => SASL}) do |ctx|
-        @connection.negotiation_failed(ctx.stanza)
-        ctx.done!
       end
 
       on(:anything) do |ctx|
@@ -341,24 +351,23 @@ module EM::Xmpp
 
     def extract_jid(stanza)
       jid = stanza.xpath('//bind:jid', {'bind' => Bind})
-      jid.text if jid.any?
+      jid.first.text if jid.any?
     end
 
     def bind_to_resource(wanted_res=nil)
-      c.send_stanza(c.iq_stanza('type' => 'set') do |x|
-        x.bind('xmlns' => Bind) do |y|
-          y.resource(wanted_res) if wanted_res
-        end
-      end)
+      c.send_stanza(c.iq_stanza({'type' => 'set'},
+					x('bind',{'xmlns' => Bind},
+            x_if(wanted_res,'resource',wanted_res)
+					)
+				)
+			)
     end
 
     def start_session
-      session_request = c.iq_stanza('type' => 'set', 'to' => jid.domain) do |x|
-        x.session('xmlns' => Session) 
-      end
+      session_request = c.iq_stanza({'type' => 'set', 'to' => jid.domain}, x('session','xmlns' => Session))
 
       c.send_stanza(session_request) do |ctx|
-        if ctx.bit!(:stanza).type == 'result'
+        if ctx.bit(:stanza).type == 'result'
           @connection.negotiation_finished
           ctx.delete_xpath_handler!.done!
         else
@@ -385,13 +394,7 @@ module EM::Xmpp
     end
 
     def reply_sasl(msg, val=nil, mech=nil)
-      c.send_xml do |x|
-        if val
-          x.send(msg, val, {'xmlns' => SASL, 'mechanism' => mech})
-        else
-          x.send(msg,  {'xmlns' => SASL, 'mechanism' => mech})
-        end
-      end
+      c.send_xml(msg,  val, 'xmlns' => SASL, 'mechanism' => mech)
     end
 
   end