comparison src/plugins/plugin_xep_0048.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 a2bc5089c2eb
children 33c8c4973743
comparison
equal deleted inserted replaced
2143:c3cac21157d4 2144:1d3f73e065e1
71 self.host.plugins[C.TEXT_CMDS].registerTextCommands(self) 71 self.host.plugins[C.TEXT_CMDS].registerTextCommands(self)
72 except KeyError: 72 except KeyError:
73 log.info(_("Text commands not available")) 73 log.info(_("Text commands not available"))
74 74
75 @defer.inlineCallbacks 75 @defer.inlineCallbacks
76 def profileConnected(self, profile): 76 def profileConnected(self, client):
77 client = self.host.getClient(profile) 77 local = client.bookmarks_local = PersistentBinaryDict(NS_BOOKMARKS, client.profile)
78 local = client.bookmarks_local = PersistentBinaryDict(NS_BOOKMARKS, profile)
79 yield local.load() 78 yield local.load()
80 if not local: 79 if not local:
81 local[XEP_0048.MUC_TYPE] = dict() 80 local[XEP_0048.MUC_TYPE] = dict()
82 local[XEP_0048.URL_TYPE] = dict() 81 local[XEP_0048.URL_TYPE] = dict()
83 private = yield self._getServerBookmarks('private', profile) 82 private = yield self._getServerBookmarks('private', client.profile)
84 pubsub = client.bookmarks_pubsub = None 83 pubsub = client.bookmarks_pubsub = None
85 84
86 for bookmarks in (local, private, pubsub): 85 for bookmarks in (local, private, pubsub):
87 if bookmarks is not None: 86 if bookmarks is not None:
88 for (room_jid, data) in bookmarks[XEP_0048.MUC_TYPE].items(): 87 for (room_jid, data) in bookmarks[XEP_0048.MUC_TYPE].items():