Merge pull request #82 from Madriix/master

Optimization of the 'gone' and 'readme'

Author: realrasengan

README.md

@@ -176,7 +176,7 @@ To use it, simply install `npm install express express-session` and add the foll
   "WebAdminPanelPassword":"<password>",
 ```
 
-Then launch the web page in the browser at `http://127.0.0.1:8889`
+Then launch the web page in the browser at `http://127.0.0.1:8889`. The login is `bouncerAdmin` and the password is `WebAdminPanelPassword`.
 
 The web page is designed to be used with a proxy from nginx or httpd, by creating a subdomain like https://j-bnc.domain.com and configuring the proxy:
 

lib/ClientConnect.js

@@ -84,6 +84,8 @@ class ClientConnect {
             this.client.messagetags = false;
             this.client.ircv3Monitor = false;
             this.client.ircv3_extendedjoin = false;
+            this.client.gone='';
+            this.client.goneTime='';
 
             // Default is null, false is reconnecting, and true is disconnected before 005.
             this.client.preConnectionLogout = false;
@@ -770,7 +772,8 @@ class ClientConnect {
                     if (data[0] == "ERROR") {
                         if (this.client.gone) {
                             clearTimeout(this.client.gone);
-                            this.client.gone = null;
+                            this.client.gone = '';
+                            this.client.goneTime = '';
                         }
                     }
                     if (lines[n].length > 1) {

lib/ClientReconnect.js

@@ -16,6 +16,8 @@ class ClientReconnect {
       this.connection = this.connections[socket.hash];
       this.connection.parents[this.connection.parents.length] = socket;
       clearTimeout(this.connection.gone);
+      this.connection.gone='';
+      this.connection.goneTime='';
       socket.connected = true;
       let newdevice = false;
       if (!this.connection.buffers[socket.clientbuffer]) {

lib/Server.js

@@ -712,6 +712,7 @@ class Server {
                             this.connections[socket.hash].write(`AWAY :away-${Math.floor(Date.now() / 1000)}\n`);
                             if (global.BOUNCER_TIMEOUT != 0 && global.BOUNCER_TIMEOUT != null) {
                                 this.connections[socket.hash].gone = setTimeout(() => { try { this.connections[socket.hash].write("QUIT :jbnc gateway\n"); this.connections[socket.hash].end(); } catch (e) { } delete this.connections[socket.hash]; }, global.BOUNCER_TIMEOUT * 1000, socket.hash);
+                                this.connections[socket.hash].goneTime = Math.floor(Date.now() / 1000);
                             }
                         }
                     }

lib/WebAdminPanel.js

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

lib/webadminpanel/dashboard.html

@@ -24,7 +24,7 @@ <h5>Last UncaughtException: {{ last_bug }}</h5>
         <h2 class="mt-4">Connections (total: {{ count }}) :</h2>
         <ul>
             <li v-for="connection in connections" :key="connection.id">
-                Key: {{ connection.key }} - Nick: {{ connection.nick }} - User: {{ connection.user }} - Host: {{ connection.host }} - Number of channels: {{ connection.channelCount }} - <button class="kill btn btn-primary" @click="removeConnection(connection.key, $event)">Kill</button>
+                <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 }} - <span v-if="connection.goneTime !== ''" class="p-2 text-light bg-danger">{{ calculateElapsedTime(connection.goneTime) }}</span>
             </li>
         </ul>
     </div>
@@ -77,7 +77,6 @@ <h2 class="mt-4">Connections (total: {{ count }}) :</h2>
                         })
                         .then((data) => {
                             if (data == "disconnected") {
-                                event.target.innerText="disconnected !";
                                 const index = this.connections.findIndex(connection => connection.key === key);
                                 if (index !== -1) {
                                     this.connections.splice(index, 1);
@@ -90,6 +89,17 @@ <h2 class="mt-4">Connections (total: {{ count }}) :</h2>
                         .catch(function(error) {
                             console.error("Error sending request:", error);
                         });
+                },
+                calculateElapsedTime(goneTime) {
+                    const currentTime = Math.floor(Date.now() / 1000);
+                    const elapsedSeconds = currentTime - goneTime;
+
+                    if (elapsedSeconds < 60) {
+                        return 'Gone since ' + elapsedSeconds + ' seconds';
+                    } else {
+                        const elapsedMinutes = Math.floor(elapsedSeconds / 60);
+                        return 'Gone since ' + elapsedMinutes + ' minutes';
+                    }
                 }
             },
             mounted() {
@@ -99,7 +109,6 @@ <h2 class="mt-4">Connections (total: {{ count }}) :</h2>
                 }, 5000);
             }
         });
-
     </script>
 </body>
 </html>