Changeset 40:75ee881b216f in ralphm-patches

Timestamp:

Feb 22, 2010, 6:21:30 PM (12 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Fix up outbound presence handling, prepare for presence subs.

File:

• xmpp_client_service.patch (modified) (22 diffs)

xmpp_client_service.patch

@@ -1 +1 @@
 diff -r 62f841ed2a99 doc/examples/client_service.tac
 --- /dev/null   Thu Jan 01 00:00:00 1970 +0000
-+++ b/doc/examples/client_service.tac   Sun Feb 21 14:28:09 2010 +0100
++++ b/doc/examples/client_service.tac   Mon Feb 22 18:20:52 2010 +0100
 @@ -0,0 +1,74 @@
 +from twisted.application import service, strports
@@ -79 +79 @@
 diff -r 62f841ed2a99 wokkel/client.py
 --- a/wokkel/client.py  Sat Feb 13 18:57:26 2010 +0100
-+++ b/wokkel/client.py  Sun Feb 21 14:28:09 2010 +0100
++++ b/wokkel/client.py  Mon Feb 22 18:20:52 2010 +0100
 @@ -10,13 +10,27 @@
  that should probably eventually move there.
@@ -94 +94 @@
 +from twisted.words.protocols.jabber import client, error, sasl, xmlstream
 +from twisted.words.protocols.jabber.jid import JID, internJID
-+from twisted.words.xish import domish
++from twisted.words.xish import domish, utility
  
  from wokkel import generic
@@ -120 +120 @@
      def __init__(self, jid, password):
          xmlstream.ConnectAuthenticator.__init__(self, jid.host)
-@@ -186,3 +200,338 @@
+@@ -186,3 +200,349 @@
      c = XMPPClientConnector(reactor, domain, factory)
      c.connect()
@@ -398 +398 @@
 +        self.connectionManager = None
 +        self.sessions = {}
++        self.clientStream = utility.EventDispatcher()
++        self.clientStream.addObserver('/*', self.routeOrDeliver, -1)
 +
 +
@@ -445 +447 @@
 +            element['from'] = sender.full()
 +
++        self.clientStream.dispatch(element)
++
++
++    def routeOrDeliver(self, element):
++        if element.handled:
++            return
++
 +        if (not element.hasAttribute('to') or
-+                internJID(element['to']).host == self.domain):
++            internJID(element['to']).host == self.domain):
 +            # This stanza is for local delivery
++            log.msg("Delivering locally: %r" % element.toXml())
 +            self.xmlstream.dispatch(element)
 +        else:
-+            # This stanza is for remote delivery
++            # This stanza is for remote routing
++            log.msg("Routing remotely: %r" % element.toXml())
 +            self.xmlstream.send(element)
 +
@@ -461 +472 @@
 diff -r 62f841ed2a99 wokkel/component.py
 --- a/wokkel/component.py       Sat Feb 13 18:57:26 2010 +0100
-+++ b/wokkel/component.py       Sun Feb 21 14:28:09 2010 +0100
++++ b/wokkel/component.py       Mon Feb 22 18:20:52 2010 +0100
 @@ -313,12 +313,24 @@
          """
@@ -491 +502 @@
 diff -r 62f841ed2a99 wokkel/xmppim.py
 --- a/wokkel/xmppim.py  Sat Feb 13 18:57:26 2010 +0100
-+++ b/wokkel/xmppim.py  Sun Feb 21 14:28:09 2010 +0100
++++ b/wokkel/xmppim.py  Mon Feb 22 18:20:52 2010 +0100
 @@ -12,8 +12,11 @@
  All of it should eventually move to Twisted.
@@ -651 +662 @@
          self.send(Presence(to=entity, type='unsubscribed'))
  
-@@ -478,7 +481,7 @@
+@@ -395,7 +398,10 @@
+         self.xmlstream.addObserver("/presence", self._onPresence)
+ 
+ 
+-    def _onPresence(self, element):
++    def parsePresence(self, element):
++        """
++        Parse presence.
++        """
+         stanza = Stanza.fromElement(element)
+ 
+         presenceType = stanza.stanzaType or 'available'
+@@ -405,7 +411,12 @@
+         except KeyError:
+             return
+ 
+-        presence = parser.fromElement(element)
++        return parser.fromElement(element)
++
++
++    def _onPresence(self, element):
++        presence = self.parsePresence(element)
++        presenceType = presence.stanzaType or 'available'
+ 
+         try:
+             handler = getattr(self, '%sReceived' % presenceType)
+@@ -478,7 +489,7 @@
  
          @param recipient: Optional Recipient to which the presence should be
@@ -660 +697 @@
          @param show: Optional detailed presence information. One of C{'away'},
              C{'xa'}, C{'chat'}, C{'dnd'}.
-@@ -503,7 +506,7 @@
+@@ -503,7 +514,7 @@
          Send unavailable presence.
  
@@ -669 +706 @@
          @param statuses: dictionary of natural language descriptions of the
              availability status, keyed by the language descriptor. A status
-@@ -520,7 +523,7 @@
+@@ -520,7 +531,7 @@
          Send subscription request
  
@@ -678 +715 @@
          presence = SubscriptionPresence(recipient=recipient, sender=sender)
          presence.stanzaType = 'subscribe'
-@@ -532,7 +535,7 @@
+@@ -532,7 +543,7 @@
          Send unsubscription request
  
@@ -687 +724 @@
          presence = SubscriptionPresence(recipient=recipient, sender=sender)
          presence.stanzaType = 'unsubscribe'
-@@ -544,7 +547,7 @@
+@@ -544,7 +555,7 @@
          Send subscription confirmation.
  
@@ -696 +733 @@
          presence = SubscriptionPresence(recipient=recipient, sender=sender)
          presence.stanzaType = 'subscribed'
-@@ -556,7 +559,7 @@
+@@ -556,7 +567,7 @@
          Send unsubscription confirmation.
  
@@ -705 +742 @@
          presence = SubscriptionPresence(recipient=recipient, sender=sender)
          presence.stanzaType = 'unsubscribed'
-@@ -568,7 +571,7 @@
+@@ -568,7 +579,7 @@
          Send presence probe.
  
@@ -714 +751 @@
          presence = ProbePresence(recipient=recipient, sender=sender)
          self.send(presence.toElement())
-@@ -652,7 +655,7 @@
+@@ -652,7 +663,7 @@
  
  
@@ -723 +760 @@
          item.name = element.getAttribute('name')
          subscription = element.getAttribute('subscription')
-@@ -715,7 +718,7 @@
+@@ -715,7 +726,7 @@
          itemElement = iq.query.item
  
@@ -732 +769 @@
              item = self._parseRosterItem(iq.query.item)
              self.onRosterSet(item)
-@@ -763,7 +766,7 @@
+@@ -763,7 +774,7 @@
      def _onRosterGet(self, iq):
          iq.handled = True
@@ -741 +778 @@
          d.addErrback(lambda _: error.ErrorStanza('internal-error').toResponse(iq))
          d.addBoth(self.send)
-@@ -808,3 +811,380 @@
+@@ -808,3 +819,416 @@
          """
          Called when a message stanza was received.
@@ -863 +900 @@
 +
 +        userSessions = self.sessionManager.sessions.get(bareJID.user, {})
-+        print userSessions
 +
 +        recipients = set()
@@ -927 +963 @@
 +        self.remotePresences = {} # user -> remote entity -> presence
 +
++        self.sessionManager.clientStream.addObserver('/presence',
++                                                     self._onPresenceOutbound)
++
 +
 +    def _broadcastToOtherResources(self, presence):
@@ -1067 +1106 @@
 +
 +
-+    def getDirection(self, presence):
-+        if not presence.recipient:
-+            if presence.sender.host == self.domain:
-+                # broadcast presence from local domain
-+                return 'Broadcast'
-+            else:
-+                raise Exception("Unexpected missing to address")
-+        else:
-+            if presence.sender.host == self.domain:
-+                # directed presence from local domain
-+                return 'Directed'
-+            elif presence.recipient.host == self.domain:
-+                # incoming remote presence
-+                return 'Inbound'
-+            else:
-+                raise Exception("Badly routed presence")
++    def _onPresenceOutbound(self, element):
++        log.msg("Got outbound presence: %r" % element.toXml())
++        presence = self.parsePresence(element)
++
++        presenceType = presence.stanzaType or 'available'
++        method = '%sReceivedOutbound' % presenceType
++        print method
++
++        try:
++            handler = getattr(self, method)
++        except AttributeError:
++            return
++        else:
++            element.handled = True
++            handler(presence)
++
 +
 +    def availableReceived(self, presence):
-+        direction = self.getDirection(presence)
-+        handler = getattr(self, "_on_available%s" % direction)
-+        if handler:
-+            handler(presence)
-+            presence.handled = True
-+        else:
-+            print "Unhandled: %r" % presence.element.toXml()
-+
-+
-+    def unavailableReceived(self, presence):
-+        direction = self.getDirection(presence)
-+        handler = getattr(self, "_on_unavailable%s" % direction)
-+        if handler:
-+            handler(presence)
-+            presence.handled = True
-+        else:
-+            print "Unhandled: %r" % presence.element.toXml()
-+
++        self._on_availableInbound(presence)
++
++
++    def availableReceivedOutbound(self, presence):
++        if presence.recipient:
++            pass # self._on_availableDirected(presence)
++        else:
++            self._on_availableBroadcast(presence)
++
++
++#    def unavailableReceived(self, presence):
++#        self._on_unavailableInbound(presence)
++
++
++    def unavailableReceivedOutbound(self, presence):
++        if presence.recipient:
++            pass # self._on_unavailableDirected(presence)
++        else:
++            self._on_unavailableBroadcast(presence)
++
++
++    def subscribedReceivedOutbound(self, presence):
++        log.msg("%r subscribed %s to its presence" % (presence.sender,
++                                                      presence.recipient))
++        #self.send(presence.element)
++
++
++    def unsubscribedReceivedOutbound(self, presence):
++        log.msg("%r unsubscribed %s from its presence" % (presence.sender,
++                                                          presence.recipient))
++        #self.send(presence.element)
++
++
++    def subscribeReceived(self, presence):
++        log.msg("%r requests subscription to %s" % (presence.sender,
++                                                    presence.recipient))
++
++
++    def subscribeReceivedOutbound(self, presence):
++        log.msg("%r requests subscription to %s" % (presence.sender,
++                                                    presence.recipient))
++        self.send(presence.element)
++
++
++    def unsubscribeReceived(self, presence):
++        log.msg("%r requests unsubscription from %s" % (presence.sender,
++                                                        presence.recipient))
++
++    def unsubscribeReceivedOutbound(self, presence):
++        log.msg("%r requests unsubscription from %s" % (presence.sender,
++                                                        presence.recipient))
++        self.send(presence.element)
 +
 +