source: ralphm-patches/deferred_xmlstream_factory.patch @ 12:fc40892815eb

wokkel/client.py

@@ -11 +11 @@
 """
 
 from twisted.application import service
-from twisted.internet import defer, protocol, reactor
+from twisted.internet import reactor
 from twisted.names.srvconnect import SRVConnector
 from twisted.words.protocols.jabber import client, sasl, xmlstream
 
-try:
-    from twisted.words.xish.xmlstream import BootstrapMixin
-except ImportError:
-    from wokkel.compat import BootstrapMixin
-
-from wokkel.subprotocols import StreamManager, XMPPHandler
+from wokkel import generic
+from wokkel.subprotocols import StreamManager
 
 class CheckAuthInitializer(object):
     """
@@ -127 +123 @@
             return c
 
 
-class DeferredClientFactory(BootstrapMixin, protocol.ClientFactory):
-    protocol = xmlstream.XmlStream
+class DeferredClientFactory(generic.DeferredXmlStreamFactory):
 
     def __init__(self, jid, password):
-        BootstrapMixin.__init__(self)
-
-        self.jid = jid
-        self.password = password
-
-        deferred = defer.Deferred()
-        self.deferred = deferred
-        self.addBootstrap(xmlstream.INIT_FAILED_EVENT, deferred.errback)
-
-        class ConnectionInitializedHandler(XMPPHandler):
-            def connectionInitialized(self):
-                deferred.callback(None)
-
-        self.streamManager = StreamManager(self)
-        self.addHandler(ConnectionInitializedHandler())
-
-
-    def buildProtocol(self, addr):
-        """
-        Create an instance of XmlStream.
-
-        A new authenticator instance will be created and passed to the new
-        XmlStream. Registered bootstrap event observers are installed as well.
-        """
-        self.authenticator = client.XMPPAuthenticator(self.jid, self.password)
-        xs = self.protocol(self.authenticator)
-        xs.factory = self
-        self.installBootstraps(xs)
-        return xs
-
-
-    def clientConnectionFailed(self, connector, reason):
-        self.deferred.errback(reason)
+        authenticator = client.XMPPAuthenticator(jid, password)
+        generic.DeferredXmlStreamFactory.__init__(self, authenticator)
 
 
     def addHandler(self, handler):
@@ -180 +144 @@
         self.streamManager.removeHandler(handler)
 
 
+
 def clientCreator(factory):
-    domain = factory.jid.host
+    domain = factory.authenticator.jid.host
     c = SRVConnector(reactor, 'xmpp-client', domain, factory)
     c.connect()
     return factory.deferred

wokkel/generic.py

@@ -9 +9 @@
 
 from zope.interface import implements
 
-from twisted.internet import defer
-from twisted.words.protocols.jabber import error
+from twisted.internet import defer, protocol
+from twisted.words.protocols.jabber import error, xmlstream
 from twisted.words.protocols.jabber.xmlstream import toResponse
 from twisted.words.xish import domish, utility
 
+try:
+    from twisted.words.xish.xmlstream import BootstrapMixin
+except ImportError:
+    from wokkel.compat import BootstrapMixin
+
 from wokkel import disco
 from wokkel.iwokkel import IDisco
 from wokkel.subprotocols import XMPPHandler
@@ -155 +160 @@
         self.sink = utility.EventDispatcher()
         self.source.send = lambda obj: self.sink.dispatch(obj)
         self.sink.send = lambda obj: self.source.dispatch(obj)
+
+
+class DeferredXmlStreamFactory(BootstrapMixin, protocol.ClientFactory):
+    protocol = xmlstream.XmlStream
+
+    def __init__(self, authenticator):
+        BootstrapMixin.__init__(self)
+
+        self.authenticator = authenticator
+
+        deferred = defer.Deferred()
+        self.deferred = deferred
+        self.addBootstrap(xmlstream.STREAM_AUTHD_EVENT, self.deferred.callback)
+        self.addBootstrap(xmlstream.INIT_FAILED_EVENT, deferred.errback)
+
+
+    def buildProtocol(self, addr):
+        """
+        Create an instance of XmlStream.
+
+        A new authenticator instance will be created and passed to the new
+        XmlStream. Registered bootstrap event observers are installed as well.
+        """
+        xs = self.protocol(self.authenticator)
+        xs.factory = self
+        self.installBootstraps(xs)
+        return xs
+
+
+    def clientConnectionFailed(self, connector, reason):
+        self.deferred.errback(reason)