Got the initial connect screen to display in webclient again.

evennia/server/portal/portalsessionhandler.py

@@ -369,13 +369,21 @@ class PortalSessionHandler(SessionHandler):
 
         # distribute outgoing data to the correct session methods.
         if session:
-            print ("portalsessionhandler.data_out:", session, kwargs)
             for cmdname, (cmdargs, cmdkwargs) in kwargs.iteritems():
-                try:
-                    getattr(session, "send_%s" % cmdname)(*cmdargs, **cmdkwargs)
-                except AttributeError:
-                    session.send_default(cmdname, *cmdargs, **cmdkwargs)
-                except Exception:
-                    log_trace()
+                funcname = "send_%s" % cmdname
+                if hasattr(session, funcname):
+                    # better to use hassattr here over try..except
+                    # - avoids hiding AttributeErrors in the call.
+                    try:
+                        getattr(session, funcname)(*cmdargs, **cmdkwargs)
+                    except Exception:
+                        log_trace()
+                else:
+                    try:
+                        # note that send_default always takes cmdname
+                        # as arg too.
+                        session.send_default(cmdname, *cmdargs, **cmdkwargs)
+                    except Exception:
+                        log_trace()
 
 PORTAL_SESSIONS = PortalSessionHandler()

evennia/server/portal/webclient.py

@@ -143,7 +143,8 @@ class WebSocketClient(Protocol, Session):
 
         """
         if args:
-            text = args.pop(0)
+            args = list(args)
+            text = args[0]
             if text is None:
                 return
         options = kwargs.get("options", {})
@@ -156,16 +157,14 @@ class WebSocketClient(Protocol, Session):
             # screenreader mode cleans up output
             text = parse_ansi(text, strip_ansi=True, xterm256=False, mxp=False)
             text = _RE_SCREENREADER_REGEX.sub("", text)
-
         cmd = "prompt" if prompt else "text"
-
         if raw:
-            # no processing
-            data = json.dumps([cmd, (text,) + args, kwargs])
+            args[0] = text
         else:
-            # send normally, with html processing
-            data = json.dumps([cmd, (parse_html(text, strip_ansi=nomarkup),) +  args, kwargs])
-        self.sendLine(data)
+            args[0] = parse_html(text, strip_ansi=nomarkup)
+
+        # send to client on required form [cmdname, args, kwargs]
+        self.sendLine(json.dumps([cmd, args, kwargs]))
 
 
     def send_prompt(self, *args, **kwargs):
@@ -186,4 +185,5 @@ class WebSocketClient(Protocol, Session):
                 client instead.
 
         """
+        print "send_default", cmdname, args, kwargs
         session.sendLine(json.dumps([cmdname, args, kwargs]))