comparison src/memory/sqlite.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 c3cac21157d4
children 087eec4c6c07
comparison
equal deleted inserted replaced
2143:c3cac21157d4 2144:1d3f73e065e1
205 try: 205 try:
206 return self.profiles[profile_name] in self.components 206 return self.profiles[profile_name] in self.components
207 except KeyError: 207 except KeyError:
208 raise exceptions.NotFound(u"the requested profile doesn't exists") 208 raise exceptions.NotFound(u"the requested profile doesn't exists")
209 209
210 def createProfile(self, name): 210 def getEntryPoint(self, profile_name):
211 try:
212 return self.components[self.profiles[profile_name]]
213 except KeyError:
214 raise exceptions.NotFound(u"the requested profile doesn't exists or is not a component")
215
216 def createProfile(self, name, component=None):
211 """Create a new profile 217 """Create a new profile
212 218
213 @param name: name of the profile 219 @param name(unicode): name of the profile
220 @param component(None, unicode): if not None, must point to a component entry point
214 @return: deferred triggered once profile is actually created 221 @return: deferred triggered once profile is actually created
215 """ 222 """
216 223
217 def getProfileId(ignore): 224 def getProfileId(ignore):
218 return self.dbpool.runQuery("SELECT (id) FROM profiles WHERE name = ?", (name, )) 225 return self.dbpool.runQuery("SELECT (id) FROM profiles WHERE name = ?", (name, ))
219 226
227 def setComponent(profile_id):
228 id_ = profile_id[0][0]
229 d_comp = self.dbpool.runQuery("INSERT INTO components(profile_id, entry_point) VALUES (?, ?)", (id_, component))
230 d_comp.addCallback(lambda dummy: profile_id)
231 return d_comp
232
220 def profile_created(profile_id): 233 def profile_created(profile_id):
221 _id = profile_id[0][0] 234 id_= profile_id[0][0]
222 self.profiles[name] = _id # we synchronise the cache 235 self.profiles[name] = id_ # we synchronise the cache
223 236
224 d = self.dbpool.runQuery("INSERT INTO profiles(name) VALUES (?)", (name, )) 237 d = self.dbpool.runQuery("INSERT INTO profiles(name) VALUES (?)", (name, ))
225 d.addCallback(getProfileId) 238 d.addCallback(getProfileId)
239 if component is not None:
240 d.addCallback(setComponent)
226 d.addCallback(profile_created) 241 d.addCallback(profile_created)
227 return d 242 return d
228 243
229 def deleteProfile(self, name): 244 def deleteProfile(self, name):
230 """Delete profile 245 """Delete profile