Merge pull request #87 from Madriix/master

Update jBNC

Author: realrasengan

bouncer.js

@@ -64,12 +64,26 @@ process.on('SIGHUP', function () {
 
 if (global.UNCAUGHTEXCEPTION) {
   // Prevent BNC from crashing for all other users when an error is caused by a user (with log error and time)
-  process.on('uncaughtException', (err, origin) => {
+  /*process.on('uncaughtException', (err, origin) => {
     console.error(`${parseInt(Number(new Date()) / 1000)} # Serious problem (${origin}) - this should not happen but the JBNC is still running. ${err.stack}`);
     global.LAST_BUG = new Date().toLocaleString();
+  });*/
+
+  process.on('uncaughtException', (err, origin) => {
+    if (Array.isArray(err)) {
+      // Do something with the error if it's an array
+      console.error(`${new Date().toLocaleString()} - Error originating from an array:`, err);
+    } else {
+      // Handle other types of errors
+      console.error(`${new Date().toLocaleString()} - ${parseInt(Number(new Date()) / 1000)} # Serious problem (${origin}) - this should not happen but the JBNC is still running. ${err.stack}`);
+    }
+    global.LAST_BUG = new Date().toLocaleString();
   });
+  
 }
 
+
+
 const jBNC = require('./lib/Server');
 
 const server = new jBNC();

lib/ClientConnect.js

@@ -87,6 +87,7 @@ class ClientConnect {
             this.client.ircv3_extendedjoin = false;
             this.client.gone='';
             this.client.goneTime='';
+            this.client.users = -1;
 
             // Default is null, false is reconnecting, and true is disconnected before 005.
             this.client.preConnectionLogout = false;
@@ -295,6 +296,7 @@ class ClientConnect {
                         case '001': // RPL_WELCOME
                             if (!this.client.authenticated) {
                                 this.client.authenticated = true;
+                                this.client.users=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

@@ -9,10 +9,10 @@ class ClientReconnect {
   }
 
   init(socket) {
-    let _success = true;
+    /*let _success = true;
     if (socket.connected)
-      _success = false;
-    if (_success) {
+      _success = false;*/
+    if (true) {
       this.connection = this.connections[socket.hash];
       this.connection.parents[this.connection.parents.length] = socket;
       clearTimeout(this.connection.gone);
@@ -43,6 +43,8 @@ class ClientReconnect {
         this.write(socket, ":*jbnc PRIVMSG " + this.connection.nick + " :Attaching you to the network\n");
         this.write(socket, this.connection.motd + "\n");
         this.write(socket, ":*jbnc 376 " + this.connection.nick + " :End of /MOTD command.\n");
+      } else {
+        this.connection.users++;
       }
 
       this.write(socket, ":*jbnc PRIVMSG " + this.connection.nick + " :Attaching you to the network\n");

lib/Server.js

@@ -706,7 +706,8 @@ class Server {
                     }
                     let i=0;
                     if (i < this.connections[socket.hash].parents.length) {
-                        if(this.users <= 1)
+                        this.connections[socket.hash].users--;
+                        if(this.connections[socket.hash].users <= 1)
                             this.connections[socket.hash].parents.splice(i, 1);
                         if (this.connections[socket.hash].parents.length == 0) {
                             this.connections[socket.hash].connected = false;

lib/WebAdminPanel.js

@@ -65,6 +65,7 @@ class WebAdminPanel {
               host: this.connections[key].host,
               realname: this.connections[key].realname,
               goneTime: this.connections[key].goneTime,
+              users: this.connections[key].users,
               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">
-                <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>
+                <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>
             </li>
         </ul>
     </div>