Merge pull request #88 from Madriix/master

Added an additional statistic: "Connections on the session since the …

Author: realrasengan

lib/ClientConnect.js

@@ -88,6 +88,7 @@ class ClientConnect {
             this.client.gone='';
             this.client.goneTime='';
             this.client.users = -1;
+            this.client.sessionConnections = 0;
 
             // Default is null, false is reconnecting, and true is disconnected before 005.
             this.client.preConnectionLogout = false;
@@ -297,6 +298,7 @@ class ClientConnect {
                             if (!this.client.authenticated) {
                                 this.client.authenticated = true;
                                 this.client.users=1;
+                                this.client.sessionConnections=1;
                                 this.client.nick_original = data[2];
                                 if (lines[n].lastIndexOf("@") > 0) {
                                     this.client.ircuser = lines[n].substr(lines[n].lastIndexOf("!") + 1, lines[n].lastIndexOf("@") - lines[n].lastIndexOf("!") - 1);

lib/ClientReconnect.js

@@ -45,6 +45,7 @@ class ClientReconnect {
         this.write(socket, ":*jbnc 376 " + this.connection.nick + " :End of /MOTD command.\n");
       } else {
         this.connection.users++;
+        this.connection.sessionConnections++;
       }
 
       this.write(socket, ":*jbnc PRIVMSG " + this.connection.nick + " :Attaching you to the network\n");

lib/WebAdminPanel.js

@@ -66,6 +66,7 @@ class WebAdminPanel {
               realname: this.connections[key].realname,
               goneTime: this.connections[key].goneTime,
               users: this.connections[key].users,
+              sessionConnections: this.connections[key].sessionConnections,
               channelCount: this.instanceConnections.userChannelCount(key)
             };
             connectionsData.push(connection);

lib/webadminpanel/dashboard.html

@@ -22,9 +22,9 @@ <h1>JBNC</h1>
         <h4 class="mt-3">Last Launch: {{ last_launch }}</h4>
         <h5>Last UncaughtException: {{ last_bug }}</h5>
         <h2 class="mt-4">Connections (total: {{ count }}) :</h2>
-        <ul>
-            <li v-for="connection in connections" :key="connection.id">
-                <button class="kill btn btn-primary" @click="removeConnection(connection.key, $event)">Kill</button> Nick: {{ connection.nick }} - User: {{ connection.user }} - Host: {{ connection.host }} - Number of channels: {{ connection.channelCount }} - Users: {{ connection.users }} - <span v-if="connection.goneTime !== ''" class="p-2 text-light bg-danger">{{ calculateElapsedTime(connection.goneTime) }}</span>
+        <ul class="list-group">
+            <li class="list-group-item" v-for="connection in connections" :key="connection.id">
+                <button class="kill btn btn-primary" @click="removeConnection(connection.key, $event)">Kill</button> <strong>Nick:</strong> {{ connection.nick }} - <strong>User:</strong> {{ connection.user }} - <strong>Host:</strong> {{ connection.host }} - <strong>Number of channels:</strong> {{ connection.channelCount }} - <strong>Users:</strong> {{ connection.users }} - <strong>Connections on the session since the beginning:</strong> {{ connection.sessionConnections }} - <span v-if="connection.goneTime !== ''" class="p-2 text-light bg-danger">{{ calculateElapsedTime(connection.goneTime) }}</span>
             </li>
         </ul>
     </div>