explain the statusbar + fix 3 bugs:

* wizard got stuck confirming previous config if only telnet or nc
* join_priv_chan loaded the status channel in a way that caused hilights
* pushworker could die because a client's active chan was not present in
   user.chans; nice symptom of a race somewhere orz
   (fixed at least one of them where /part could skip unsetting
   old_active_chan and /a tried to jump back into it; maybe that was it)

Author: 9001

README.md

@@ -41,7 +41,7 @@ technical:
 * message input with readline-like editing (arrow-left/right, home/end, backspace)
   * history of sent messages (arrow-up/down)
 * bandwidth-conservative (push/pop lines instead of full redraws; scroll-regions)
-* fast enough; 1'000 clients @ 700 msgs/sec
+* fast enough; 600 clients @ 750 msgs/sec, or 1'000 cli @ 350 msg/s
 
 ## windows clients
 
@@ -74,6 +74,7 @@ if you enable TLS with `-tpt 2424` (telnet) and/or `-tpn 1515` (netcat) you can
 
 * `telnet-ssl -zssl -zsecure -zcacert=r0c.crt r0c.int 2424`
 * `socat -,raw,echo=0 openssl:r0c.int:1515,cafile=cert.crt`
+* `socat -,raw,echo=0 openssl:127.0.0.1:1515,verify=0`
 * `stty -icanon; ncat --ssl --ssl-trustfile r0c.crt -v r0c.int 1515`
 * `stty -icanon; openssl s_client -CAfile ~/.r0c/cert.crt -nbio -connect r0c.int:1515`
 * windows: [powershell client](https://github.com/9001/r0c/blob/master/clients/powershell.ps1) with port `+1515` (the `+` enables TLS)
@@ -129,7 +130,7 @@ iptables -t nat -A PREROUTING -i eth0 -p tcp --dport 531 -j REDIRECT --to-port 1
 
 # documentation
 
-not really but there is a [list of commands](docs/help-commands.md) and a [list of hotkeys](docs/help-hotkeys.md)
+not really but there is a [list of commands](docs/help-commands.md) and a [list of hotkeys](docs/help-hotkeys.md), and also [UI demystified](docs/help-ui.md)
 
 ## protips
 

docs/help-topics.md

@@ -3,5 +3,6 @@
 |-|-|
 | `/help intro`    | the quickstart guide
 | `/help about`    | about r0c
+| `/help ui`       | user interface
 | `/help commands` | list of commands
 | `/help hotkeys`  | list of hotkeys

docs/help-ui.md

@@ -0,0 +1,15 @@
+# the statusbar
+
+was loosely inspired by irssi and looks something like this:
+
+`192939   1: #g(5)   h:2   a:2,3   ed, ned, ame, same, sam`
+
+* according to the server, the UTC time is `19:29:39`
+
+* you are in window `1` (the first channel you joined), which is channel `#g`, which has `5` users
+
+* `h:2` you were hilighted (your name was mentioned) in window `2`; use the command **`/2`** or just press **`CTRL-E`** which takes you to the channel with the most important happening
+
+* `a:2,3` activity in windows `2` and `3` which you haven't seen
+
+* the 5 users in `#g`, sorted by when they last said soemthing

r0c/chat.py

@@ -73,6 +73,15 @@ def __init__(self, user, nchan, alias=None):
         self.lock_to_bottom = True
         self.vis = []  # type: list[VisMessage]  # visible messages
 
+    def __unicode__(self):
+        return u"UChannel <%s> @ <%s>" % (self.user, self.nchan)
+
+    def __str__(self):
+        return "UChannel <%s> @ <%s>" % (self.user, self.nchan)
+
+    def __repr__(self):
+        return "UChannel(%r, %r, %r)" % (self.user, self.nchan, self.alias)
+
     def update_activity_flags(self, set_last_read=False, last_nchan_msg=0):
         if not last_nchan_msg and self.nchan.msgs:
             last_nchan_msg = self.nchan.msgs[-1].sno

r0c/ivt100.py

@@ -841,10 +841,22 @@ def delayed_drop():
             # switch to new channel,
             # storing the last viewed message for notification purposes
             if self.user.new_active_chan:
+                usr = self.user
+                if usr.new_active_chan not in usr.chans:
+                    t = "new_active_chan (%s) not in user.chans (%s |%d|)"
+                    Util.whoops(t % (usr.new_active_chan, usr, len(usr.chans)))
+                    usr.new_active_chan = usr.chans[0]
+
                 if self.user.active_chan:
                     self.user.active_chan.update_activity_flags(True)
 
-                self.user.old_active_chan = self.user.active_chan
+                # print("         /w:  %s  %s" % (usr.active_chan, usr.new_active_chan))
+
+                if usr.active_chan in usr.chans:
+                    usr.old_active_chan = usr.active_chan
+                else:
+                    usr.old_active_chan = None
+
                 self.user.active_chan = self.user.new_active_chan
                 self.user.active_chan.update_activity_flags(True)
                 self.user.new_active_chan = None
@@ -2169,7 +2181,9 @@ def conf_wizard(self, growth):
 
             elif u"n" in text:
                 self.default_config()
+                old_nick = self.user.nick
                 self.user.set_rand_nick()
+                print(" regen nick:  %s  %s" % (old_nick, self.user.nick))
                 if not self.check_correct_iface("qwer_prompt"):
                     return
 
@@ -2599,11 +2613,9 @@ def u8(tx):
                 self.world.cserial += 1
 
     def check_correct_iface(self, next_stage):
-        if not self.host.other_if:
-            return True
-
         self.wizard_stage = next_stage
-        if self.iface_confirmed:
+
+        if self.iface_confirmed or not self.host.other_if:
             return True
 
         self.iface_confirmed = True

r0c/user.py

@@ -385,6 +385,7 @@ def exec_cmd(self, cmd_str):
                 )
                 return
 
+            print("       join:  %s  %s" % (arg, self.nick))
             nchan = self.world.join_pub_chan(self, arg[1:]).nchan
             # this is in charge of activating the new channel,
             # rapid part/join will crash us without this
@@ -401,6 +402,9 @@ def exec_cmd(self, cmd_str):
                 )
                 return
 
+            ac = self.active_chan
+            ch_name = "#" + ac.nchan.name if ac.nchan.name else ac.alias
+            print("       part:  %s  %s" % (ch_name, self.nick))
             self.world.part_chan(self.active_chan)
             # this is in charge of activating the new channel,
             # rapid part/join will crash us without this
@@ -447,6 +451,7 @@ def exec_cmd(self, cmd_str):
                 )
                 return
 
+            print("       /msg:  %s  %s" % (self.nick, arg1))
             uchan = self.world.join_priv_chan(self, arg1)
             self.new_active_chan = uchan
             self.world.send_chan_msg(self.nick, uchan.nchan, arg2)
@@ -625,6 +630,12 @@ def exec_cmd(self, cmd_str):
                 # 	self.new_active_chan.nchan.get_name()))
             else:
                 print("cannot jump, no hilights or prev chan")
+                return
+
+            if self.new_active_chan not in self.chans:
+                t = "/a tried to new_active_chan (%s) not in self.chans (%s |%d|)"
+                Util.whoops(t % (self.new_active_chan, self, len(self.chans)))
+                self.new_active_chan = self.chans[0]
 
             self.client.need_full_redraw = True
             self.client.refresh(False)
@@ -813,18 +824,16 @@ def exec_cmd(self, cmd_str):
                 self.client.save_config()
 
         elif cmd == u"ey":
+            t = u"Hilight on @all / @everyone enabled. Disable with /en"
             self.client.atall = True
-            self.world.send_chan_msg(
-                u"--", inf, u"Hilight on @all / @everyone enabled. Disable with /en", False
-            )
+            self.world.send_chan_msg(u"--", inf, t, False)
             self.build_nick_re()
             self.client.save_config()
 
         elif cmd == u"en":
+            t = u"Hilight on @all / @everyone disabled. Enable with /en"
             self.client.atall = False
-            self.world.send_chan_msg(
-                u"--", inf, u"Hilight on @all / @everyone disabled. Enable with /en", False
-            )
+            self.world.send_chan_msg(u"--", inf, t, False)
             self.build_nick_re()
             self.client.save_config()
 

r0c/world.py

@@ -296,8 +296,7 @@ def join_priv_chan(self, user, alias):
             if uchan is None:
                 nchan = Chat.NChannel(None, u"DM with [[uch_a]]")
                 self.priv_ch.append(nchan)
-                uchan = self.join_chan_obj(user, nchan)
-                uchan.alias = alias
+                uchan = self.join_chan_obj(user, nchan, alias)
             return uchan
 
     """

test/stress.py

@@ -29,15 +29,15 @@
 #
 
 NUM_CLIENTS = 1
-NUM_CLIENTS = 320
+NUM_CLIENTS = 512
 NUM_PER_MPW = 32
 
 # CHANNELS = ['#1']
 CHANNELS = ["#1", "#2", "#3", "#4"]
 
 EVENT_DELAY = 0.01
 EVENT_DELAY = 0.005
-EVENT_DELAY = 1
+EVENT_DELAY = 3
 # EVENT_DELAY = None
 
 ITERATIONS = 1000000
@@ -380,6 +380,7 @@ def jump_channels(self):
         chance = [10, 5, 4, 18]
         chance = [10, 3, 2, 30]
         chance = [10, 30, 2, 130]
+        chance = [10, 30, 2, 330]
 
         for n in range(len(chance) - 1):
             chance[n + 1] += chance[n]
@@ -657,6 +658,7 @@ def __init__(self, port, behavior, cmd_q, stat_q, n1):
             n = NUM_PER_MPW * n1 + n2
             c = Client(self, self.port, self.behavior, stat_q, n)
             self.clients.append(c)
+            time.sleep(0.2)
 
     def run(self):
         while self.cmd_q.empty():
@@ -761,6 +763,6 @@ def signal_handler(self, signal, frame):
 
 
 # (1x) rm -rf log/chan/{1,2,3,4,a} log/pm/ && timeout 110 python3 -u -m r0c --bench | tee bench
-# (3x) cd ~/dev/r0c/test/ && ./run-stress.sh 2323
+# (2x) cd ~/dev/r0c/test/ && ./run-stress.sh 2323
 # grep -E '^[0-9]{6} [0-9]{9}' bench
 # ps auxwww | awk '/python3[ ]stress.py[ ]2323/{print$2}' | xargs kill