comparison src/plugins/plugin_xep_0054.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 c42aab22c2c0
children 33c8c4973743
comparison
equal deleted inserted replaced
2143:c3cac21157d4 2144:1d3f73e065e1
86 host.bridge.addMethod(u"avatarSet", u".plugin", in_sign=u'ss', out_sign=u'', method=self._setAvatar, async=True) 86 host.bridge.addMethod(u"avatarSet", u".plugin", in_sign=u'ss', out_sign=u'', method=self._setAvatar, async=True)
87 host.trigger.add(u"presence_available", self.presenceAvailableTrigger) 87 host.trigger.add(u"presence_available", self.presenceAvailableTrigger)
88 host.memory.setSignalOnUpdate(u"avatar") 88 host.memory.setSignalOnUpdate(u"avatar")
89 host.memory.setSignalOnUpdate(u"nick") 89 host.memory.setSignalOnUpdate(u"nick")
90 90
91 def getHandler(self, profile): 91 def getHandler(self, client):
92 return XEP_0054_handler(self) 92 return XEP_0054_handler(self)
93 93
94 def isRoom(self, client, entity_jid): 94 def isRoom(self, client, entity_jid):
95 """Tell if a jid is a MUC one 95 """Tell if a jid is a MUC one
96 96
126 x_elt.addElement('photo', content=avatar_hash) 126 x_elt.addElement('photo', content=avatar_hash)
127 presence_elt.addChild(x_elt) 127 presence_elt.addChild(x_elt)
128 return True 128 return True
129 129
130 @defer.inlineCallbacks 130 @defer.inlineCallbacks
131 def profileConnecting(self, profile): 131 def profileConnecting(self, client):
132 client = self.host.getClient(profile) 132 client._cache_0054 = persistent.PersistentBinaryDict(NS_VCARD, client.profile)
133 client._cache_0054 = persistent.PersistentBinaryDict(NS_VCARD, profile)
134 yield client._cache_0054.load() 133 yield client._cache_0054.load()
135 self._fillCachedValues(profile) 134 self._fillCachedValues(client.profile)
136 135
137 def _fillCachedValues(self, profile): 136 def _fillCachedValues(self, profile):
138 #FIXME: this may need to be reworked 137 #FIXME: this may need to be reworked
139 # the current naive approach keeps a map between all jids 138 # the current naive approach keeps a map between all jids
140 # in persistent cache, then put avatar hashs in memory. 139 # in persistent cache, then put avatar hashs in memory.