Mercurial > libervia-backend
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 2143:c3cac21157d4 | 2144:1d3f73e065e1 |
|---|---|
| 70 """ | 70 """ |
| 71 def __init__(self, host): | 71 def __init__(self, host): |
| 72 log.info(_("Extended Stanza Addressing plugin initialization")) | 72 log.info(_("Extended Stanza Addressing plugin initialization")) |
| 73 self.host = host | 73 self.host = host |
| 74 self.internal_data = {} | 74 self.internal_data = {} |
| 75 host.trigger.add("messageSend", self.messageSendTrigger, trigger.TriggerManager.MIN_PRIORITY) | 75 host.trigger.add("sendMessage", self.sendMessageTrigger, trigger.TriggerManager.MIN_PRIORITY) |
| 76 host.trigger.add("MessageReceived", self.messageReceivedTrigger) | 76 host.trigger.add("MessageReceived", self.messageReceivedTrigger) |
| 77 | 77 |
| 78 def messageSendTrigger(self, client, mess_data, pre_xml_treatments, post_xml_treatments): | 78 def sendMessageTrigger(self, client, mess_data, pre_xml_treatments, post_xml_treatments): |
| 79 """Process the XEP-0033 related data to be sent""" | 79 """Process the XEP-0033 related data to be sent""" |
| 80 profile = client.profile | 80 profile = client.profile |
| 81 | 81 |
| 82 def treatment(mess_data): | 82 def treatment(mess_data): |
| 83 if not 'address' in mess_data['extra']: | 83 if not 'address' in mess_data['extra']: |
| 122 """ | 122 """ |
| 123 def send(mess_data, skip_send=False): | 123 def send(mess_data, skip_send=False): |
| 124 client = self.host.profiles[profile] | 124 client = self.host.profiles[profile] |
| 125 d = defer.Deferred() | 125 d = defer.Deferred() |
| 126 if not skip_send: | 126 if not skip_send: |
| 127 d.addCallback(client.sendMessage) | 127 d.addCallback(client.sendMessageData) |
| 128 d.addCallback(self.host.messageAddToHistory, client) | 128 d.addCallback(self.host.messageAddToHistory, client) |
| 129 d.addCallback(self.host.messageSendToBridge, client) | 129 d.addCallback(self.host.sendMessageToBridge, client) |
| 130 d.addErrback(lambda failure: failure.trap(exceptions.CancelError)) | 130 d.addErrback(lambda failure: failure.trap(exceptions.CancelError)) |
| 131 return d.callback(mess_data) | 131 return d.callback(mess_data) |
| 132 | 132 |
| 133 def discoCallback(entities, to_jid_s): | 133 def discoCallback(entities, to_jid_s): |
| 134 history_data = copy.deepcopy(mess_data) | 134 history_data = copy.deepcopy(mess_data) |
| 179 pass # no addresses | 179 pass # no addresses |
| 180 else: | 180 else: |
| 181 post_treat.addCallback(post_treat_addr, addresses.children) | 181 post_treat.addCallback(post_treat_addr, addresses.children) |
| 182 return True | 182 return True |
| 183 | 183 |
| 184 def getHandler(self, profile): | 184 def getHandler(self, client): |
| 185 return XEP_0033_handler(self, profile) | 185 return XEP_0033_handler(self, client.profile) |
| 186 | 186 |
| 187 | 187 |
| 188 class XEP_0033_handler(XMPPHandler): | 188 class XEP_0033_handler(XMPPHandler): |
| 189 implements(iwokkel.IDisco) | 189 implements(iwokkel.IDisco) |
| 190 | 190 |