Merge pull request #79 from Madriix/master

Correction: "Cannot create property 'mobile' on boolean 'false'"

Author: realrasengan

bouncer.js

@@ -37,6 +37,8 @@ global.SERVER = global.BOUNCER_MODE == 'gateway' ? (config.server ? config.serve
 global.MSG_REDISTRIBUTION = config.MsgRedistribution ? true : false;
 global.DEBUG = config.debug ? config.debug : false;
 global.WEBIRCSPECIAL = config.webircSpecial ? config.webircSpecial : false;
+global.IRC_STANDARDS = config.ircStandards ? config.ircStandards : true;
+global.UNCAUGHTEXCEPTION = config.uncaughtException ? config.uncaughtException : true;
 
 global.ircCommandList = new Set(["JOIN", "PART", "QUIT", "MODE", "PING", "NICK", "KICK"]);
 global.ircCommandRedistributeMessagesOnConnect = new Set(["AWAY", "NICK", "ACCOUNT", "PART", "QUIT", "MODE", "KICK", "TOPIC"]);
@@ -53,12 +55,12 @@ process.on('SIGHUP', function () {
   global.BOUNCER_ADMIN = config.bouncerAdmin ? config.bouncerAdmin : '';
 });
 
-/*
-// 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) => {
-  console.error(`${parseInt(Number(new Date()) / 1000)} # Serious problem (${origin}) - this should not happen but the JBNC is still running. ${err.stack}`);
-});
-*/
+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) => {
+    console.error(`${parseInt(Number(new Date()) / 1000)} # Serious problem (${origin}) - this should not happen but the JBNC is still running. ${err.stack}`);
+  });
+}
 
 const jBNC = require('./lib/Server');
 

lib/ClientConnect.js

@@ -719,23 +719,43 @@ class ClientConnect {
                         case '433': // ERR_NICKNAMEINUSE
                             if (this.client.parents.length == 0) {
                                 if (data[2] == '*') {
-                                    if (global.DEBUG)
-                                        console.log("Une erreur 433 est détecté, un quit ?");
-                                    this.client.end();
-                                    /*this.write("NICK "+data[3].trim()+"_"+"\n");
-                                    this.nick=data[3].trim()+"_";*/
+                                    if (global.IRC_STANDARDS) {
+                                        this.write("NICK "+data[3].trim()+"_"+"\n");
+                                        this.nick=data[3].trim()+"_";
+                                    } else {
+                                        if (global.DEBUG)
+                                            console.log("ERROR 433 is detected. Quit ?");
+                                        this.client.end();
+                                    }
                                 }
+                            } else {
+                                if (global.DEBUG)
+                                    console.log("ERROR 433 !this.client.parents.length is detected. Quit ?");
+                                    try {
+                                        this.connections[this.client.hash].end();
+                                    } catch (e) { }
+                                    delete this.connections[this.client.hash];
                             }
                             break;
                         case '451': // ERR_NOTREGISTERED
                             if (this.client.parents.length == 0) {
                                 if (data[2] == '*') {
-                                    if (global.DEBUG)
-                                        console.log("Une erreur 451 est détecté, un quit ?");
-                                    this.client.end();
-                                    /*this.write("NICK "+data[3].trim()+"_"+"\n");
-                                    this.nick=data[3].trim()+"_";*/
+                                    if (global.IRC_STANDARDS) {
+                                        this.write("NICK "+data[3].trim()+"_"+"\n");
+                                        this.nick=data[3].trim()+"_";
+                                    } else {
+                                        if (global.DEBUG)
+                                            console.log("ERROR 451 is detected. Quit ?");
+                                        this.client.end();
+                                    }
                                 }
+                            } else {
+                                if (global.DEBUG)
+                                    console.log("ERROR 451 !this.client.parents.length is detected. Quit ?");
+                                    try {
+                                        this.connections[this.client.hash].end();
+                                    } catch (e) { }
+                                    delete this.connections[this.client.hash];
                             }
                             break;
                     }