Changeset 118:a70736af32c3 for wokkel/muc.py

Timestamp:

Oct 20, 2008, 8:37:06 PM (14 years ago)

Author:

Christopher Zorn <tofu@…>

Branch:

wokkel-muc-client-support-24

Convert:

svn:b33ecbfc-034c-dc11-8662-000475d9059e/branches/wokkel-muc-client-support-24@114

Message:

add timeouts and a test for a user leaving a room

File:

• wokkel/muc.py (modified) (10 diffs)

wokkel/muc.py

@@ -14 +14 @@
 from zope.interface import implements
 
-from twisted.internet import defer
+from twisted.internet import defer, reactor
 from twisted.words.protocols.jabber import jid, error, xmlstream
 from twisted.words.xish import domish
@@ -87 +87 @@
 STATUS_CODE_CREATED = 201
 
+DEFER_TIMEOUT = 30 # basic timeout is 30 seconds
 
 class MUCError(error.StanzaError):
@@ -341 +342 @@
             x['role'] = role
 
+class UnavailableUserPresence(xmppim.UnavailablePresence):
+    """
+    This behaves like an object providing L{domish.IElement}.
+
+    """
+
+    def __init__(self, to=None, type=None, frm=None, affiliation=None, role=None):
+        xmppim.UnavailablePresence.__init__(self, to, type)
+        if frm:
+            self['from'] = frm
+        # add muc elements
+        x = self.addElement('x', NS_MUC_USER)
+        if affiliation:
+            x['affiliation'] = affiliation
+        if role:
+            x['role'] = role
+
 
 class PasswordPresence(BasicPresence):
@@ -388 +406 @@
     rooms = {}
 
+    timeout = None
+
+    _deferreds = []
+
     def connectionInitialized(self):
         self.xmlstream.addObserver(PRESENCE+"[not(@type) or @type='available']/x", self._onXPresence)
@@ -412 +434 @@
         """
         """
+
         if not prs.hasAttribute('from'):
             return
@@ -601 +624 @@
         return getattr(iq,'query', None)
         
+
+    def sendDeferred(self,  obj, timeout):
+        """ Send data or a domish element, adding a deferred with a timeout.
+        """
+        d = defer.Deferred()
+        self._deferreds.append(d)
+
+
+        def onTimeout():
+            i = 0
+            for xd in self._deferreds:
+                if d == xd:
+                    self._deferreds.pop(i)
+                    d.errback(xmlstream.TimeoutError("Timeout waiting for response."))
+                i += 1
+
+        call = reactor.callLater(timeout, onTimeout)
+        
+        def cancelTimeout(result):
+            if call.active():
+                call.cancel()
+
+            return result
+
+        d.addBoth(cancelTimeout)
+
+        self.xmlstream.send(obj)
+        return d
+
     def disco(self, entity, type='info'):
         """Send disco queries to a XMPP entity
@@ -649 +701 @@
         
         """
-        d = defer.Deferred()
         r = Room(room, server, nick, state='joining')
         self._setRoom(r)
  
         p = BasicPresence(to=r.entity_id)
-        # p['from'] = self.jid.full()
-        self.xmlstream.send(p)
+        d = self.sendDeferred(p, timeout=DEFER_TIMEOUT)
 
         # add observer for joining the room
@@ -685 +735 @@
         """
 
-        d = defer.Deferred()
+        
         r = self._getRoom(room_jid)
         if r is None:
@@ -693 +743 @@
         # make sure we call the method to generate the new entity xmpp id
         p = BasicPresence(to=r.entityId()) 
-        self.xmlstream.send(p)
+        d = self.sendDeferred(p, timeout=DEFER_TIMEOUT)
 
         # add observer for joining the room
@@ -706 +756 @@
         """
         """
-        d = defer.Deferred()
-
         r = self._getRoom(room_jid)
  
         p = xmppim.UnavailablePresence(to=r.entity_id)
-        # p['from'] = self.jid.full()
-        self.xmlstream.send(p)
-
+
+        d = self.sendDeferred(p, timeout=DEFER_TIMEOUT)
         # add observer for joining the room
         self.xmlstream.addOnetimeObserver(PRESENCE+"[@from='%s' and @type='unavailable']" % (r.entity_id.full()),