diff src/plugins/plugin_xep_0280.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 7de291c3cd0c
children 33c8c4973743
line wrap: on
line diff
--- a/src/plugins/plugin_xep_0280.py	Tue Feb 07 00:15:03 2017 +0100
+++ b/src/plugins/plugin_xep_0280.py	Sun Feb 12 17:55:43 2017 +0100
@@ -76,7 +76,7 @@
         host.memory.updateParams(self.params)
         host.trigger.add("MessageReceived", self.messageReceivedTrigger, priority=1000)
 
-    def getHandler(self, profile):
+    def getHandler(self, client):
         return XEP_0280_handler()
 
     def setPrivate(self, message_elt):
@@ -92,15 +92,14 @@
         message_elt.addElement((NS_CARBONS, u'private'))
 
     @defer.inlineCallbacks
-    def profileConnected(self, profile):
+    def profileConnected(self, client):
         """activate message carbons on connection if possible and activated in config"""
-        client = self.host.getClient(profile)
-        activate = self.host.memory.getParamA(PARAM_NAME, PARAM_CATEGORY, profile_key=profile)
+        activate = self.host.memory.getParamA(PARAM_NAME, PARAM_CATEGORY, profile_key=client.profile)
         if not activate:
             log.info(_(u"Not activating message carbons as requested in params"))
             return
         try:
-            yield self.host.checkFeatures((NS_CARBONS,), profile=profile)
+            yield self.host.checkFeatures((NS_CARBONS,), profile=client.profile)
         except exceptions.FeatureNotFound:
             log.warning(_(u"server doesn't handle message carbons"))
         else:
@@ -149,7 +148,7 @@
             if not mess_data['message'] and not mess_data['subject']:
                 return False
             self.host.messageAddToHistory(mess_data, client)
-            self.host.messageSendToBridge(mess_data, client)
+            self.host.sendMessageToBridge(mess_data, client)
         else:
             log.warning(u"invalid message carbons received:\n{xml}".format(
                 xml = message_elt.toXml()))