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
This commit is contained in:
parent
9b2923f161
commit
97337202cb
4 changed files with 839 additions and 523 deletions
|
|
@ -164,15 +164,6 @@ class Bridge(BridgeFrontend):
|
|||
kwargs['error_handler'] = error_handler
|
||||
return self.db_core_iface.addContact(entity_jid, profile_key, **kwargs)
|
||||
|
||||
def asyncCreateProfile(self, profile, password='', callback=None, errback=None):
|
||||
if callback is None:
|
||||
error_handler = None
|
||||
else:
|
||||
if errback is None:
|
||||
errback = log.error
|
||||
error_handler = lambda err:errback(dbus_to_bridge_exception(err))
|
||||
return self.db_core_iface.asyncCreateProfile(profile, password, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler)
|
||||
|
||||
def asyncDeleteProfile(self, profile, callback=None, errback=None):
|
||||
if callback is None:
|
||||
error_handler = None
|
||||
|
|
@ -243,12 +234,7 @@ class Bridge(BridgeFrontend):
|
|||
if errback is None:
|
||||
errback = log.error
|
||||
error_handler = lambda err:errback(dbus_to_bridge_exception(err))
|
||||
kwargs={}
|
||||
if callback is not None:
|
||||
kwargs['timeout'] = const_TIMEOUT
|
||||
kwargs['reply_handler'] = callback
|
||||
kwargs['error_handler'] = error_handler
|
||||
return self.db_core_iface.disconnect(profile_key, **kwargs)
|
||||
return self.db_core_iface.disconnect(profile_key, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler)
|
||||
|
||||
def getConfig(self, section, name, callback=None, errback=None):
|
||||
if callback is None:
|
||||
|
|
@ -560,6 +546,15 @@ class Bridge(BridgeFrontend):
|
|||
kwargs['error_handler'] = error_handler
|
||||
return self.db_core_iface.paramsRegisterApp(xml, security_limit, app, **kwargs)
|
||||
|
||||
def profileCreate(self, profile, password='', component='', callback=None, errback=None):
|
||||
if callback is None:
|
||||
error_handler = None
|
||||
else:
|
||||
if errback is None:
|
||||
errback = log.error
|
||||
error_handler = lambda err:errback(dbus_to_bridge_exception(err))
|
||||
return self.db_core_iface.profileCreate(profile, password, component, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler)
|
||||
|
||||
def profileIsSessionStarted(self, profile_key="@DEFAULT@", callback=None, errback=None):
|
||||
if callback is None:
|
||||
error_handler = None
|
||||
|
|
|
|||
|
|
@ -125,6 +125,8 @@ class ProfileCreate(base.CommandBase):
|
|||
self.parser.add_argument('-j', '--jid', type=str, help=_('the jid of the profile'))
|
||||
self.parser.add_argument('-x', '--xmpp-password', type=str, help=_('the password of the XMPP account (use profile password if not specified)'),
|
||||
metavar='PASSWORD')
|
||||
self.parser.add_argument('-C', '--component', type=base.unicode_decoder, default='',
|
||||
help=_(u'set to component import name (entry point) if this is a component'))
|
||||
|
||||
def _session_started(self, dummy):
|
||||
if self.args.jid:
|
||||
|
|
@ -142,7 +144,7 @@ class ProfileCreate(base.CommandBase):
|
|||
if self.args.profile in self.host.bridge.getProfilesList():
|
||||
log.error("Profile %s already exists." % self.args.profile)
|
||||
self.host.quit(1)
|
||||
self.host.bridge.asyncCreateProfile(self.args.profile, self.args.password, callback=self._profile_created, errback=None)
|
||||
self.host.bridge.profileCreate(self.args.profile, self.args.password, self.args.component, callback=self._profile_created, errback=None)
|
||||
|
||||
|
||||
class ProfileModify(base.CommandBase):
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ class ProfileManager(QuickProfileManager, urwid.WidgetWrap):
|
|||
def newProfile(self, button, edit):
|
||||
"""Create the profile"""
|
||||
name = edit.get_edit_text()
|
||||
self.host.bridge.asyncCreateProfile(name, callback=lambda: self.newProfileCreated(name), errback=self.profileCreationFailure)
|
||||
self.host.bridge.createProfile(name, callback=lambda: self.newProfileCreated(name), errback=self.profileCreationFailure)
|
||||
|
||||
def newProfileCreated(self, profile):
|
||||
# new profile will be selected, and a selected profile assume the session is started
|
||||
|
|
|
|||
|
|
@ -134,7 +134,7 @@ class QuickProfileManager(object):
|
|||
def _getErrorMessage(self, reason):
|
||||
"""Return an error message corresponding to profile creation error
|
||||
|
||||
@param reason (str): reason as returned by asyncCreateProfile
|
||||
@param reason (str): reason as returned by createProfile
|
||||
@return (unicode): human readable error message
|
||||
"""
|
||||
if reason == "ConflictError":
|
||||
|
|
|
|||
Loading…
Reference in a new issue