diff src/plugins/plugin_xep_0033.py @ 2144:1d3f73e065e1

core, jp: component handling + client handling refactoring: - SàT can now handle components - plugin have now a "modes" key in PLUGIN_INFO where they declare if they can be used with clients and or components. They default to be client only. - components are really similar to clients, but with some changes in behaviour: * component has "entry point", which is a special plugin with a componentStart method, which is called just after component is connected * trigger end with a different suffixes (e.g. profileConnected vs profileConnectedComponent), so a plugin which manage both clients and components can have different workflow * for clients, only triggers of plugins handling client mode are launched * for components, only triggers of plugins needed in dependencies are launched. They all must handle component mode. * component have a sendHistory attribute (False by default) which can be set to True to allow saving sent messages into history * for convenience, "client" is still used in method even if it can now be a component * a new "component" boolean attribute tells if we have a component or a client * components have to add themselve Message protocol * roster and presence protocols are not added for components * component default port is 5347 (which is Prosody's default port) - asyncCreateProfile has been renamed for profileCreate, both to follow new naming convention and to prepare the transition to fully asynchronous bridge - createProfile has a new "component" attribute. When used to create a component, it must be set to a component entry point - jp: added --component argument to profile/create - disconnect bridge method is now asynchronous, this way frontends can know when disconnection is finished - new PI_* constants for PLUGIN_INFO values (not used everywhere yet) - client/component connection workflow has been moved to their classes instead of being a host methods - host.messageSend is now client.sendMessage, and former client.sendMessage is now client.sendMessageData. - identities are now handled in client.identities list, so it can be updated dynamically by plugins (in the future, frontends should be able to update them too through bridge) - profileConnecting* profileConnected* profileDisconnected* and getHandler now all use client instead of profile
author Goffi <goffi@goffi.org>
date Sun, 12 Feb 2017 17:55:43 +0100
parents 6e509ee853a8
children 33c8c4973743
line wrap: on
line diff
--- a/src/plugins/plugin_xep_0033.py	Tue Feb 07 00:15:03 2017 +0100
+++ b/src/plugins/plugin_xep_0033.py	Sun Feb 12 17:55:43 2017 +0100
@@ -72,10 +72,10 @@
         log.info(_("Extended Stanza Addressing plugin initialization"))
         self.host = host
         self.internal_data = {}
-        host.trigger.add("messageSend", self.messageSendTrigger, trigger.TriggerManager.MIN_PRIORITY)
+        host.trigger.add("sendMessage", self.sendMessageTrigger, trigger.TriggerManager.MIN_PRIORITY)
         host.trigger.add("MessageReceived", self.messageReceivedTrigger)
 
-    def messageSendTrigger(self, client, mess_data, pre_xml_treatments, post_xml_treatments):
+    def sendMessageTrigger(self, client, mess_data, pre_xml_treatments, post_xml_treatments):
         """Process the XEP-0033 related data to be sent"""
         profile = client.profile
 
@@ -124,9 +124,9 @@
             client = self.host.profiles[profile]
             d = defer.Deferred()
             if not skip_send:
-                d.addCallback(client.sendMessage)
+                d.addCallback(client.sendMessageData)
             d.addCallback(self.host.messageAddToHistory, client)
-            d.addCallback(self.host.messageSendToBridge, client)
+            d.addCallback(self.host.sendMessageToBridge, client)
             d.addErrback(lambda failure: failure.trap(exceptions.CancelError))
             return d.callback(mess_data)
 
@@ -181,8 +181,8 @@
             post_treat.addCallback(post_treat_addr, addresses.children)
         return True
 
-    def getHandler(self, profile):
-        return XEP_0033_handler(self, profile)
+    def getHandler(self, client):
+        return XEP_0033_handler(self, client.profile)
 
 
 class XEP_0033_handler(XMPPHandler):