Changeset 746

Timestamp:

07/28/08 10:39:42 (4 months ago)

Author:

sylvain

Message:

InformationDiscovery? handler to support Node information retrieval

Files:

• oss/headstock/headstock/api/discovery.py (modified) (2 diffs)
• oss/headstock/headstock/protocol/extension/discovery.py (modified) (6 diffs)

oss/headstock/headstock/api/discovery.py

@@ -13 +13 @@
-     XMPP_DATA_FORM_NS, XMPP_CLIENT_NS, XMPP_STREAM_NS, XMPP_PUBSUB_NS
-
-
+ 'InformationDiscovery',
-           'SubscriptionsDiscovery', 'AffiliationsDiscovery']
-
@@ -247 +247 @@
-
-        return disco
+
+class InformationDiscovery(Entity):
+    def __init__(self, from_jid, to_jid, node_name=None, type=u'get', stanza_id=None):
+        Entity.__init__(self, from_jid, to_jid, type, stanza_id)
+        self.node_name = node_name
+    
+    @staticmethod
+    def to_element(e):
+        iq = Entity.to_element(e)
+        attrs = {u'node': e.node_name}
+        E(u'query', namespace=XMPP_DISCO_INFO_NS, parent=iq,
+          attributes=attrs)
+
+        return iq
+
+    @staticmethod
+    def from_element(e):
+        disco = InformationDiscovery(JID.parse(e.get_attribute_value('from')),
+                                   JID.parse(e.get_attribute_value('to')),
+                                   type=e.get_attribute_value('type'),
+                                   stanza_id=e.get_attribute_value('id'))
+
+        return disco

oss/headstock/headstock/protocol/extension/discovery.py

@@ -2 +2 @@
-
-from headstock.api.discovery import FeaturesDiscovery, ItemsDiscovery,\
-
+, InformationDiscovery
-from bridge import Element as E
-from bridge import Attribute as A
@@ -13 +13 @@
-__all__ = ['FeaturesDiscoveryDispatcher', 'ItemsDiscoveryDispatcher',
-           'SubscriptionsDiscoveryDispatcher', 'AffiliationsDiscoveryDispatcher',
-
+InformationDiscoveryDispatcher', '
-
-class FeaturesDiscoveryDispatcher(component):
@@ -232 +232 @@
-            yield 1
-
+class InformationDiscoveryDispatcher(component):
+    
+    Inboxes = {"inbox"              : "bridge.Element instance",
+               "control"            : "Shutdown the client stream",
+               "forward"            : "",
+               }
+    
+    Outboxes = {"outbox"       : "bridge.Element instance",
+                "signal"       : "Shutdown signal",
+                "log"          : "log",
+                "unknown"      : "Unknown element that could not be dispatched properly",
+                "xmpp.get"     : "Activity requests",
+                "xmpp.set"     : "Activity requests",
+                "xmpp.result"  : "Activity responses",
+                "xmpp.error"   : "Activity response error",
+                }
+    
+    def __init__(self):
+       super(InformationDiscoveryDispatcher, self).__init__() 
+
+    def main(self):
+        while 1:
+            if self.dataReady("control"):
+                mes = self.recv("control")
+                
+                if isinstance(mes, shutdownMicroprocess) or \
+                   isinstance(mes, producerFinished):
+                    self.send(producerFinished(), "signal")
+                    break
+
+            if self.dataReady("forward"):
+                m = self.recv("forward")
+                self.send(InformationDiscovery.to_element(m), "outbox")
+
+            if self.dataReady("inbox"):
+                handled = False
+                s = self.recv("inbox")
+                e = s.xml_parent.xml_parent
+                self.send(('INCOMING', e), "log")
+                
+                msg_type = e.get_attribute_value(u'type') or u'get'
+                key = 'xmpp.%s' % unicode(msg_type)
+
+                if key in self.outboxes:
+                    self.send(InformationDiscovery.from_element(e), key)
+                    handled = True
+
+                if not handled:
+                    self.send(e, "unknown")
+
+            if not self.anyReady():
+                self.pause()
+  
+            yield 1
+
+
-class DiscoveryDispatcher(component):
-    Inboxes = {"inbox"              : "bridge.Element instance",
-               "control"            : "Shutdown the client stream",
+               
-               "features.inbox": "",
-               "subscription.inbox": "",
-               "affiliation.inbox": "",
-               "items.inbox": "",
+               "info.inbox": "",
+               
-               "features.forward": "",
-               "subscription.forward": "",
-               "affiliation.forward": "",
-               "items.forward": "",
+               "info.forward": "",
+               
-               "in.features.get"     : "Activity requests",
-               "in.features.set"     : "Activity requests",
@@ -258 +319 @@
-               "in.affiliation.set"     : "Activity requests",
-               "in.affiliation.result"  : "Activity responses",
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                "features.outbox": "",
-                "subscription.outbox": "",
-                "affiliation.outbox": "",
-                "items.outbox": "",
+                "info.outbox": "",
+                
-                "out.features.get"     : "Activity requests",
-                "out.features.set"     : "Activity requests",
@@ -284 +352 @@
-                "out.affiliation.result"  : "Activity responses",
-                "out.affiliation.error"   : "Activity response error",
+                "out.info.get"     : "Activity requests",
+                "out.info.set"     : "Activity requests",
+                "out.info.result"  : "Activity responses",
+                "out.info.error"   : "Activity response error",
-                }
-    
@@ -358 +430 @@
-        itemsdisp.activate()
-
+        infodisp = InformationDiscoveryDispatcher()
+        self.link((self, 'info.inbox'), (infodisp, 'inbox'), passthrough=1)
+        self.link((self, 'info.forward'), (infodisp, 'forward'), passthrough=1)
+        self.link((self, 'in.info.get'), (infodisp, 'forward'), passthrough=1)
+        self.link((self, 'in.info.set'), (infodisp, 'forward'), passthrough=1)
+        self.link((self, 'in.info.result'), (infodisp, 'forward'), passthrough=1)
+        self.link((self, 'in.info.error'), (infodisp, 'forward'), passthrough=1)
+        self.link((infodisp, 'outbox'), (self, 'outbox'), passthrough=2)
+        self.link((infodisp, 'xmpp.get'), (self, 'out.info.get'), passthrough=2)
+        self.link((infodisp, 'xmpp.set'), (self, 'out.info.set'), passthrough=2)
+        self.link((infodisp, 'xmpp.result'), (self, 'out.info.result'), passthrough=2)
+        self.link((infodisp, 'xmpp.error'), (self, 'out.info.error'), passthrough=2)
+        self.link((infodisp, 'unknown'), (self, 'unknown'), passthrough=2)
+        self.link((infodisp, 'log'), (self, 'log'), passthrough=2)
+        self.addChildren(infodisp)
+        infodisp.activate()
+
-        return 1
-