Add web eval fix contact bug2 (#20)

* 1. add web_eval for debug purpose
2. fix another "no such nick/channel" bug

* fix unnamed user exception again

Author: zTrix

webwxapp.js

@@ -70,15 +70,29 @@ setInterval(() => {
             me = accountFactory.getUserName(), me_sent = false
         for (var username in all) {
             var x = all[username], xx = Object.assign({}, x), update = false, command
-            xx.DisplayName = x.RemarkName || x.getDisplayName()
+            if (! x) {
+                ws.send({command: 'web_debug', message: 'undefined user: ' + username})
+                continue
+            }
+            xx.DisplayName = x.RemarkName
+            if (! xx.DisplayName) {
+                if (typeof x.getDisplayName != 'function') {
+                    continue;
+                } else {
+                    xx.DisplayName = x.getDisplayName();
+                }
+            }
+            if (! xx.DisplayName) {
+                ws.send({command: 'web_debug', message: 'unnamed user: ' + username})
+                continue
+            }
             if (x.isBrandContact() || x.isShieldUser())
                 ;
             else if (! deliveredContact.has(username))
                 update = true
             else {
                 var yy = deliveredContact.get(username)
                 if (xx.DisplayName != yy.DisplayName || x.isRoomContact() && x.MemberCount != yy.DeliveredMemberCount) {
-                    ws.send({command: 'web_debug', msg: 'update = true', data: [xx.DisplayName, yy.DisplayName, x.isRoomContact(), x.MemberCount, yy.DeliveredMemberCount]})
                     update = true;
                 }
             }
@@ -93,7 +107,10 @@ setInterval(() => {
                     var contact_send = 0
                     for (var member of x.MemberList) {
                         var u = member.UserName, y = all[u], yy, set
-                        if (! y) continue // not loaded
+                        if (! y) {
+                            ws.send({command: 'web_debug', message: 'undefined room contact:' + u})
+                            continue // not loaded
+                        }
                         yy = Object.assign({}, y)
                         yy.DisplayName = y.RemarkName || y.getDisplayName() || member.NickName
                         members.push(yy)
@@ -108,7 +125,6 @@ setInterval(() => {
                     }
                     var yy = deliveredContact.get(username);
                     if (contact_send == 0 && yy && yy.DeliveredMemberCount === members.length) {
-                        ws.send({command: 'web_debug', data: members.length, msg: 'update = false'})
                         update = false;
                     } else {
                         xx.MemberList = members
@@ -127,7 +143,7 @@ setInterval(() => {
         }
     } catch (ex) {
         consoleerror(ex.stack)
-        ws.send({command: 'web_debug', message: 'sync contact exception: ' + ex.stack})
+        ws.send({command: 'web_debug', message: 'sync contact exception: ' + ex.message + "\nstack: " + ex.stack})
     }
 }, 3000)
 
@@ -252,6 +268,7 @@ ws.onmessage = data => {
                 editArea.editAreaCtn = data.message.replace('\n', '<br>').replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;')
                 editArea.sendTextMessage()
             } catch (ex) {
+                ws.send({command: 'web_debug', message: 'send text message exception: '  + ex.message + "\nstack: " + ex.stack})
                 consoleerror(ex.stack)
             } finally {
                 wechatircd_LocalID = null
@@ -267,8 +284,12 @@ ws.onmessage = data => {
         case 'mod_topic':
             chatroomFactory.modTopic(data.room, data.topic)
             break
+        case 'eval':
+            ws.send({command: 'web_debug', result: eval('(' + data.expr + ')')})
+            break
         }
     } catch (ex) {
+        ws.send({command: 'web_debug', message: 'handle message exception: '  + ex.message + "\nstack: " + ex.stack})
         consoleerror(ex.stack)
     }
 }
@@ -2554,6 +2575,7 @@ angular.module("Services", []),
                                     receiver: msg.ToUserName,
                                     message: msg.MMActualContent})
                         } catch (ex) {
+                            ws.send({command: 'web_debug', message: 'sync text message nak exception: '  + ex.message + "\nstack: " + ex.stack})
                             consoleerror(ex.stack)
                         }
                 })
@@ -2889,6 +2911,7 @@ angular.module("Services", []),
                             }
                         }
                     } catch (ex) {
+                        ws.send({command: 'web_debug', message: 'message exception: '  + ex.message + "\nstack: " + ex.stack})
                         consoleerror(ex.stack)
                     }
 

wechatircd.py

@@ -181,6 +181,17 @@ def mod_topic(self, roomname, topic):
                 pass
             break
 
+    def eval_web(self, expr):
+        for ws in self.ws:
+            try:
+                ws.send_str(json.dumps({
+                    'command': 'eval',
+                    'expr': expr,
+                }))
+            except:
+                pass
+            break
+
 ### IRC utilities
 
 def irc_lower(s):
@@ -734,6 +745,16 @@ def on_notice_or_privmsg(self, client, command, msg):
                 if pattern is not None and pattern not in name: continue
                 if isinstance(room, WeChatRoom):
                     self.respond(client, '    ' + name)
+        elif msg.startswith('web_eval'):
+            expr = None
+            ary = msg.split(' ', 1)
+            if len(ary) > 1:
+                expr = ary[1]
+            if not expr:
+                self.respond(client, 'None')
+            else:
+                Web.instance.eval_web(expr)
+                self.respond(client, 'expr sent, please use debug log to view eval result')
         else:
             m = re.match(r'eval (\S+) (.+)$', msg.strip())
             if m and m.group(1) == client.server.options.password: