Got the initial connect screen to display in webclient again.

evennia/server/portal/portalsessionhandler.py

@@ -369,11 +369,19 @@ 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():
+                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, "send_%s" % cmdname)(*cmdargs, **cmdkwargs)
+                        getattr(session, funcname)(*cmdargs, **cmdkwargs)
-                except AttributeError:
+                    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()

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
+            args[0] = text
-            data = json.dumps([cmd, (text,) + args, kwargs])
         else:
-            # send normally, with html processing
+            args[0] = parse_html(text, strip_ansi=nomarkup)
-            data = json.dumps([cmd, (parse_html(text, strip_ansi=nomarkup),) +  args, kwargs])
+
-        self.sendLine(data)
+        # 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]))

evennia/web/webclient/static/webclient/js/evennia.js

@@ -112,7 +112,7 @@ An "emitter" object must have a function
             }
             this.connection.msg(data);
 
-            log('client msg sending: ' + cmdname + " " + args + " " + outargs + " " + outkwargs);
+            log('client msg sending: ', cmdname, args, outargs, outkwargs);
         },
 
         // Evennia -> Client.
@@ -126,7 +126,6 @@ An "emitter" object must have a function
         //   kwargs (obj): keyword-args to listener
         //
         emit: function (cmdname, args, kwargs) {
-            log('emit called with args: ' + cmdname + ',' + args + ',' + kwargs);
             if (kwargs.cmdid) {
                 cmdmap[kwargs.cmdid].apply(this, [args, kwargs]);
                 delete cmdmap[kwargs.cmdid];
@@ -153,8 +152,7 @@ An "emitter" object must have a function
         //   kwargs (obj): Argument to the listener.
         //
         var emit = function (cmdname, args, kwargs) {
-            log('emit', cmdname, args, kwargs);
+            log("DefaultEmitter.emit:", cmdname, args, kwargs);
-
             if (listeners[cmdname]) {
                 listeners[cmdname].apply(this, [args, kwargs]);
             };
@@ -168,6 +166,7 @@ An "emitter" object must have a function
         //     to listen to cmdname events.
         //
         var on = function (cmdname, listener) {
+            log("DefaultEmitter.on", cmdname, listener);
             if (typeof(listener === 'function')) {
                 listeners[cmdname] = listener;
             };
@@ -290,9 +289,9 @@ An "emitter" object must have a function
 // Args:
 //   msg (str): Message to log to console.
 //
-function log(msg) {
+function log() {
   if (Evennia.debug) {
-    console.log(msg);
+    console.log(arguments);
   }
 }
 

evennia/web/webclient/static/webclient/js/webclient_gui.js

@@ -132,10 +132,11 @@ $(window).resize(set_window_size);
 
 function doText(args, kwargs) {
     // append message to previous ones
+    log("doText:", args, kwargs);
     $("#messagewindow").append(
-            "<div class='msg out>" + args[0] + "</div>");
+            "<div class='msg out'>" + args[0] + "</div>");
     // scroll message window to bottom
-    $("#messagewindow").animate({scrollTop: $('#messageindow')[0].scrollHeight});
+    $("#messagewindow").animate({scrollTop: $('#messagewindow')[0].scrollHeight});
 }
 
 function doPrompt(args, kwargs) {
@@ -149,6 +150,7 @@ $(document).ready(function() {
     // a small timeout to stop 'loading' indicator in Chrome
     Evennia.init()
     // register listeners
+    log("register listeners ...");
     Evennia.emitter.on("text", doText);
     Evennia.emitter.on("prompt", doPrompt);
     set_window_size();

evennia/web/webclient/templates/webclient/webclient.html

@@ -10,7 +10,7 @@
 {% block client %}
 
 <div id="client">
-    <div id="messagewindow"> mainarea  </div>
+    <div id="messagewindow"></div>
     <div id="inputform">
         <textarea name="inputfield" type="text"> </textarea>
     </div>