Starting reworking the webclient to use the new oob system format.

evennia/server/portal/telnet.py

@@ -236,9 +236,9 @@ class TelnetProtocol(Telnet, StatefulTelnetProtocol, Session):
             return
         if "oob" in kwargs and "OOB" in self.protocol_flags:
             # oob is a list of [(cmdname, arg, kwarg), ...]
-            for cmdname, args, kwargs in kwargs["oob"]:
+            for cmdname, args, okwargs in kwargs["oob"]:
                 #print "telnet oob data_out:", cmdname, args, kwargs
-                self.oob.data_out(cmdname, *args, **kwargs)
+                self.oob.data_out(cmdname, *args, **okwargs)
 
         # parse **kwargs, falling back to ttype if nothing is given explicitly
         ttype = self.protocol_flags.get('TTYPE', {})

evennia/server/portal/websocket_client.py

@@ -78,27 +78,48 @@ class WebSocketClient(Protocol, Session):
             OOB - This is an Out-of-band instruction. If so,
                   the remaining string should be a json-packed
                   string on the form {oobfuncname: [args, ], ...}
-            any other prefix (or lack of prefix) is considered
-                  plain text data, to be treated like a game
+            CMD - plain text data, to be treated like a game
                   input command.
         """
-        if string[:3] == "OOB":
-            string = string[3:]
-            try:
-                oobdata = json.loads(string)
-                for (key, args) in oobdata.items():
-                    #print "oob data in:", (key, args)
-                    self.data_in(text=None, oob=(key, make_iter(args)))
-            except Exception:
-                log_trace("Websocket malformed OOB request: %s" % string)
-        else:
+        mode = string[:3]
+        data = string[3:]
+
+        if mode == "OOB":
+            # an out-of-band command
+            self.decode_json(data)
+        elif mode == "CMD":
             # plain text input
-            self.data_in(text=string)
+            self.data_in(text=data)
 
     def sendLine(self, line):
         "send data to client"
         return self.transport.write(line)
 
+    def json_decode(self, data):
+        """
+        Decodes incoming data from the client
+
+        [cmdname, [args],{kwargs}] -> cmdname *args **kwargs
+
+        """
+        try:
+            cmdname, args, kwargs = json.loads(data)
+        except Exception:
+            log_trace("Websocket malformed OOB request: %s" % data)
+            raise
+        self.sessionhandler.data_in(oob=(cmdname, args, kwargs))
+
+    def json_encode(self, cmdname, *args, **kwargs):
+        """
+        Encode OOB data for sending to client
+
+        cmdname *args -> cmdname [json array]
+        cmdname **kwargs -> cmdname {json object}
+
+        """
+        cmdtuple = [cmdname, list(args), kwargs]
+        self.sendLine("OOB" + json.dumps(cmdtuple))
+
     def data_in(self, text=None, **kwargs):
         """
         Data Websocket -> Server
@@ -121,9 +142,9 @@ class WebSocketClient(Protocol, Session):
         except Exception, e:
             self.sendLine(str(e))
         if "oob" in kwargs:
-            oobstruct = self.sessionhandler.oobstruct_parser(kwargs.pop("oob"))
-            #print "oob data_out:", "OOB" + json.dumps(oobstruct)
-            self.sendLine("OOB" + json.dumps(oobstruct))
+            for cmdname, args, okwargs in kwargs["oob"]:
+                self.encode_json(cmdname, *args, **okwargs)
+
         raw = kwargs.get("raw", False)
         nomarkup = kwargs.get("nomarkup", False)
         if "prompt" in kwargs: