From 115bd8ed17585d23b46d8fccf39747d50b5dd42e Mon Sep 17 00:00:00 2001
From: Rossen Georgiev <rossen@rgp.io>
Date: Sun, 8 May 2016 00:58:49 +0100
Subject: [PATCH] simple interface for unified messages #26

---
 steam/client/builtins/misc.py | 102 +++++++++++++++++++++++++++++++++-
 steam/core/msg.py             |   4 +-
 2 files changed, 103 insertions(+), 3 deletions(-)

diff --git a/steam/client/builtins/misc.py b/steam/client/builtins/misc.py
index c12f33c..c955a18 100644
--- a/steam/client/builtins/misc.py
+++ b/steam/client/builtins/misc.py
@@ -1,13 +1,19 @@
 """
 Various features that don't have a category
 """
-from steam.core.msg import MsgProto
+import logging
+from eventemitter import EventEmitter
+from steam.core.msg import MsgProto, get_um
 from steam.enums.emsg import EMsg
+from steam.util import WeakRefKeyDict
 
 class Misc(object):
     def __init__(self, *args, **kwargs):
         super(Misc, self).__init__(*args, **kwargs)
 
+        name = "%s.unified_messages" % self.__class__.__name__
+        self.unified_messages = SteamUnifiedMessages(self, name)  #: instance of :class:`SteamUnifiedMessages`
+
     def games_played(self, app_ids):
         """
         Set the application being played by the user
@@ -26,3 +32,97 @@ class Misc(object):
         message.body.games_played.extend(map(lambda x: GamePlayed(game_id=x), app_ids))
 
         self.send(message)
+
+
+class SteamUnifiedMessages(EventEmitter):
+    """Simple API for send/recv of unified messages
+
+    Incoming messages are emitted as events once with their ``jobid``
+    and once with their method name (e.g. ``Player.GetGameBadgeLevels#1``)
+    """
+    def __init__(self, steam, logger_name=None):
+        self._LOG = logging.getLogger(logger_name if logger_name else self.__class__.__name__)
+        self._steam = steam
+        self._data = WeakRefKeyDict()
+
+        steam.on(EMsg.ServiceMethod, self._handle_service_method)
+        steam.on(EMsg.ClientServiceMethodResponse, self._handle_client_service_method)
+
+    def emit(self, event, *args):
+        if event is not None:
+            self._LOG.debug("Emit event: %s" % repr(event))
+        EventEmitter.emit(self, event, *args)
+
+    def _handle_service_method(self, message):
+        self.emit(message.header.target_job_name, message.body)
+
+    def _handle_client_service_method(self, message):
+        method_name = message.body.method_name
+        proto = get_um(method_name, response=True)
+
+        if proto is None:
+            self._LOG("Unable to find proto for %s" % repr(method_name))
+            return
+
+        resp = proto()
+        resp.ParseFromString(message.body.serialized_method_response)
+
+        self.emit(method_name, resp)
+
+        jobid = message.header.jobid_target
+        if jobid not in (-1, 18446744073709551615):
+            self.emit("job_%d" % jobid, resp)
+
+    def get(self, method_name):
+        """Get request proto instance for given methed name
+
+        :param method_name: name for the method (e.g. ``Player.GetGameBadgeLevels#1``)
+        :type method_name: :class:`str`
+        :return: proto message instance, or ``None`` if not found
+        """
+        proto = get_um(method_name)
+        if proto is None:
+            return None
+        message = proto()
+        self._data[message] = method_name
+        return message
+
+    def send(self, message):
+        """Send service method request
+
+        :param message: proto message instance (use :meth:`get`)
+        :return: ``jobid`` event identifier
+        :rtype: :class:`str`
+
+        Listen for ``jobid`` on this object to catch the response.
+
+        .. note::
+            If you listen for ``jobid`` on the client instance you will get the encapsulated message
+        """
+        if message not in self._data:
+            raise ValueError("Supplied message seems to be invalid. Did you use 'get' method?")
+
+        capsule = MsgProto(EMsg.ClientServiceMethod)
+        capsule.body.method_name = self._data[message]
+        capsule.body.serialized_method = message.SerializeToString()
+
+        return self._steam.send_job(capsule)
+
+    def send_and_wait(self, message, timeout=None, raises=False):
+        """Send service method request and wait for response
+
+        :param message: proto message instance (use :meth:`get`)
+        :param timeout: (optional) seconds to wait
+        :type timeout: :class:`int`
+        :param raises: (optional) On timeout if ``False`` return ``None``, else raise ``gevent.Timeout``
+        :type raises: :class:`bool`
+        :return: response proto message instance
+        :rtype: proto message, :class:`None`
+        :raises: ``gevent.Timeout``
+        """
+        job_id = self.send(message)
+        resp = self.wait_event(job_id, timeout, raises=raises)
+        if resp is None and not raises:
+            return None
+        else:
+            return resp[0]
diff --git a/steam/core/msg.py b/steam/core/msg.py
index ca28444..eae1b25 100644
--- a/steam/core/msg.py
+++ b/steam/core/msg.py
@@ -248,12 +248,12 @@ class MsgProto(object):
         self.msg = self._header.msg = msg
         self.header = self._header.proto
 
-        if msg in (EMsg.ServiceMethod, EMsg.ServiceMethod):
+        if msg == EMsg.ServiceMethod:
             proto = get_um(self.header.target_job_name)
             if proto:
                 self.body = proto()
             else:
-                self.body = '!! Unable to resolve: %s !!' % repr(self.header.target_job_name)
+                self.body = '!! Can\'t resolve ServiceMethod: %s !!' % repr(self.header.target_job_name)
         else:
             proto = get_cmsg(msg)