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
1 changed files with 839 additions and 523 deletions
|
|
@ -207,22 +207,37 @@ class SqliteStorage(object):
|
|||
except KeyError:
|
||||
raise exceptions.NotFound(u"the requested profile doesn't exists")
|
||||
|
||||
def createProfile(self, name):
|
||||
def getEntryPoint(self, profile_name):
|
||||
try:
|
||||
return self.components[self.profiles[profile_name]]
|
||||
except KeyError:
|
||||
raise exceptions.NotFound(u"the requested profile doesn't exists or is not a component")
|
||||
|
||||
def createProfile(self, name, component=None):
|
||||
"""Create a new profile
|
||||
|
||||
@param name: name of the profile
|
||||
@param name(unicode): name of the profile
|
||||
@param component(None, unicode): if not None, must point to a component entry point
|
||||
@return: deferred triggered once profile is actually created
|
||||
"""
|
||||
|
||||
def getProfileId(ignore):
|
||||
return self.dbpool.runQuery("SELECT (id) FROM profiles WHERE name = ?", (name, ))
|
||||
|
||||
def setComponent(profile_id):
|
||||
id_ = profile_id[0][0]
|
||||
d_comp = self.dbpool.runQuery("INSERT INTO components(profile_id, entry_point) VALUES (?, ?)", (id_, component))
|
||||
d_comp.addCallback(lambda dummy: profile_id)
|
||||
return d_comp
|
||||
|
||||
def profile_created(profile_id):
|
||||
_id = profile_id[0][0]
|
||||
self.profiles[name] = _id # we synchronise the cache
|
||||
id_= profile_id[0][0]
|
||||
self.profiles[name] = id_ # we synchronise the cache
|
||||
|
||||
d = self.dbpool.runQuery("INSERT INTO profiles(name) VALUES (?)", (name, ))
|
||||
d.addCallback(getProfileId)
|
||||
if component is not None:
|
||||
d.addCallback(setComponent)
|
||||
d.addCallback(profile_created)
|
||||
return d
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue