libervia-backend: sat/core/sat

comparison sat/core/sat_main.py @ 4041:2594e1951cf7

core (bridge): `action_new` now use serialised dict for extra data.

author	Goffi <goffi@goffi.org>
date	Mon, 15 May 2023 16:20:45 +0200
parents	524856bd7b19
children	9641ce286e07

comparison

equal deleted inserted replaced

-:1f967f85fc23
+:2594e1951cf7
 from twisted.words.protocols.jabber import jid
 from twisted.internet import reactor
 from wokkel.xmppim import RosterItem
 from sat.core import xmpp
 from sat.core import exceptions
+from sat.core.core_types import SatXMPPEntity
 from sat.core.log import getLogger
 from sat.core.constants import Const as C
 from sat.memory import memory
 from sat.memory import cache
 self.bridge.register_method("contact_add", self._add_contact)
 self.bridge.register_method("contact_update", self._update_contact)
 self.bridge.register_method("contact_del", self._del_contact)
 self.bridge.register_method("roster_resync", self._roster_resync)
 self.bridge.register_method("is_connected", self.is_connected)
-self.bridge.register_method("action_launch", self.launch_callback)
+self.bridge.register_method("action_launch", self._action_launch)
 self.bridge.register_method("actions_get", self.actions_get)
 self.bridge.register_method("progress_get", self._progress_get)
 self.bridge.register_method("progress_get_all", self._progress_get_all)
 self.bridge.register_method("menus_get", self.get_menus)
 self.bridge.register_method("menu_help_get", self.get_menu_help)
 # local dirs
 def get_local_path(
 self,
-client: Optional[xmpp.SatXMPPEntity],
+client: Optional[SatXMPPEntity],
 dir_name: str,
 *extra_path: str,
 component: bool = False,
 ) -> Path:
 """Retrieve path for local data
 client, namespaces, identities, bare_jids, service, roster, own_jid,
 local_device))
 async def find_by_features(
 self,
-client: xmpp.SatXMPPEntity,
+client: SatXMPPEntity,
 namespaces: List[str],
 identities: Optional[List[Tuple[str, str]]]=None,
 bare_jids: bool=False,
 service: bool=True,
 roster: bool=True,
 if keep_id is not None:
 client = self.get_client(profile)
 action_timer = reactor.callLater(60 * 30, self._kill_action, keep_id, client)
 client.actions[keep_id] = (action_data, id_, security_limit, action_timer)
-self.bridge.action_new(action_data, id_, security_limit, profile)
+self.bridge.action_new(
+data_format.serialise(action_data), id_, security_limit, profile
+)
 def actions_get(self, profile):
 """Return current non answered actions
 @param profile: %(doc_profile)s
 """
 client = self.get_client(profile)
-return [action_tuple[:-1] for action_tuple in client.actions.values()]
+return [
+(data_format.serialise(action_tuple[0]), *action_tuple[1:-1])
+for action_tuple in client.actions.values()
+]
 def register_progress_cb(
 self, progress_id, callback, metadata=None, profile=C.PROF_KEY_NONE
 ):
 """Register a callback called when progress is requested for id"""
 if "one_shot" in kwargs:  # One Shot callback are removed after 30 min
 def purge_callback():
 try:
-self.removeCallback(callback_id)
+self.remove_callback(callback_id)
 except KeyError:
 pass
 reactor.callLater(1800, purge_callback)
 return callback_id
-def removeCallback(self, callback_id):
+def remove_callback(self, callback_id):
 """ Remove a previously registered callback
 @param callback_id: id returned by [register_callback] """
 log.debug("Removing callback [%s]" % callback_id)
 del self._cb_map[callback_id]
-def launch_callback(self, callback_id, data=None, profile_key=C.PROF_KEY_NONE):
+def _action_launch(
+self,
+callback_id: str,
+data_s: str,
+profile_key: str
+) -> defer.Deferred:
+d = self.launch_callback(
+callback_id,
+data_format.deserialise(data_s),
+profile_key
+)
+d.addCallback(data_format.serialise)
+return d
+def launch_callback(
+self,
+callback_id: str,
+data: Optional[dict] = None,
+profile_key: str = C.PROF_KEY_NONE
+) -> defer.Deferred:
 """Launch a specific callback
 @param callback_id: id of the action (callback) to launch
 @param data: optional data
 @profile_key: %(doc_profile_key)s
 - validated: if present, can be used to launch a callback, it can have the
 values
 - C.BOOL_TRUE
 - C.BOOL_FALSE
 """
-#  FIXME: security limit need to be checked here
+# FIXME: is it possible to use this method without profile connected? If not,
+#     client must be used instead of profile_key
+# FIXME: security limit need to be checked here
 try:
 client = self.get_client(profile_key)
 except exceptions.NotFound:
 # client is not available yet
 profile = self.memory.get_profile_name(profile_key)
 args.insert(0, data)
 kwargs["profile"] = profile
 del kwargs["with_data"]
 if kwargs.pop("one_shot", False):
-self.removeCallback(callback_id)
+self.remove_callback(callback_id)
 return utils.as_deferred(callback, *args, **kwargs)
 # Menus management

Mercurial > libervia-backend

comparison sat/core/sat_main.py @ 4041:2594e1951cf7