Still messing with getting the webclient to talk properly to the server.

evennia/server/inputhandler_funcs.py

@@ -105,6 +105,9 @@ def text(session, *args, **kwargs):
     cmdhandler(session, text, callertype="session", session=session)
     session.update_session_counters()
 
+def echo(session, *args, **kwargs):
+    session.data_out(text=(args, kwargs))
+
 def default(session, cmdname, *args, **kwargs):
     """
     Default catch-function. This is like all other input functions except

evennia/server/portal/portalsessionhandler.py

@@ -334,7 +334,9 @@ class PortalSessionHandler(SessionHandler):
                 self.data_out(session, text=_ERROR_COMMAND_OVERFLOW)
                 return
             # scrub data
+            print ("portalsessionhandler before clean:", session, kwargs)
             kwargs = self.clean_senddata(session, kwargs)
+            print ("portalsessionhandler after clean:", session, kwargs)
 
             # relay data to Server
             self.command_counter += 1

evennia/server/portal/webclient.py

@@ -55,10 +55,6 @@ class WebSocketClient(Protocol, Session):
         self.transport.setTcpKeepAlive(1)
         self.sessionhandler.connect(self)
 
-        self.datamap = {"text": self.send_text,
-                        "prompt": self.send_prompt,
-                        "_default": self.data_oob}
-
     def disconnect(self, reason=None):
         """
         Generic hook for the engine to call in order to
@@ -95,8 +91,9 @@ class WebSocketClient(Protocol, Session):
 
         """
         cmdarray = json.loads(string)
+        print "dataReceived:", cmdarray
         if cmdarray:
-            self.data_in(**{cmdarray[0]:cmdarray[1:]})
+            self.data_in(**{cmdarray[0]:[cmdarray[1], cmdarray[2]]})
 
     def sendLine(self, line):
         """
@@ -129,8 +126,7 @@ class WebSocketClient(Protocol, Session):
         """
         self.sessionhandler.data_out(self, **kwargs)
 
-    @staticmethod
-    def send_text(session, *args, **kwargs):
+    def send_text(self, *args, **kwargs):
         """
         Send text data. This will pre-process the text for
         color-replacement, conversion to html etc.
@@ -165,25 +161,23 @@ class WebSocketClient(Protocol, Session):
 
         if raw:
             # no processing
-            data = json.dumps((text,) + args)
+            data = json.dumps([cmd, (text,) + args, kwargs])
         else:
             # send normally, with html processing
-            data = json.dumps((cmd, parse_html(text, strip_ansi=nomarkup)) +  args)
-        session.sendLine(data)
+            data = json.dumps([cmd, (parse_html(text, strip_ansi=nomarkup),) +  args, kwargs])
+        self.sendLine(data)
 
 
-    @staticmethod
-    def send_prompt(session, *args, **kwargs):
+    def send_prompt(self, *args, **kwargs):
         kwargs["options"].update({"send_prompt": True})
-        session.send_text(*args, **kwargs)
+        self.send_text(*args, **kwargs)
 
-    @staticmethod
-    def send_oob(session, *args, **kwargs):
+    def send_default(session, cmdname, *args, **kwargs):
         """
         Data Evennia -> User.
 
         Args:
-            cmd (str): The first argument will always be the oob cmd name.
+            cmdname (str): The first argument will always be the oob cmd name.
             *args (any): Remaining args will be arguments for `cmd`.
 
         Kwargs:
@@ -192,5 +186,4 @@ class WebSocketClient(Protocol, Session):
                 client instead.
 
         """
-        if args:
-            session.sendLine(json.dumps(args))
+        session.sendLine(json.dumps([cmdname, args, kwargs]))

evennia/server/sessionhandler.py

@@ -175,6 +175,7 @@ class SessionHandler(dict):
 
         rkwargs = {}
         for key, data in kwargs.iteritems():
+            print "sessionhandler.clean_senddata:", key, data
             if not data:
                 rkwargs[key] = [ [], {} ]
             elif isinstance(data, dict):