wifi fix

Wyliodrin · Jul 17, 2014 · 4743ea5 · 4743ea5
1 parent 14ccfd7
commit 4743ea5
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 25 deletions.
diff --git a/conf/wireless/wireless-open_form.conf b/conf/wireless/wireless-open_form.conf
@@ -0,0 +1,4 @@
+network={
+	ssid="<%-ssid%>"
+	key_mgmt=NONE
+}
diff --git a/conf/wireless/wireless.conf b/conf/wireless/wireless.conf
@@ -1,7 +1,4 @@
 network={
-	ssid="BingBang"
-	proto=WPA RSN
-	scan_ssid=1
-	key_mgmt=WPA-PSK NONE
-	psk="bing1029384756bang"
+	ssid="Hotel Praid Etaj 1"
+	key_mgmt=NONE
 }
diff --git a/wificonfig.js b/wificonfig.js
@@ -8,6 +8,8 @@ var set = require('./settings').config;
 var config = set.config;
 var networkConfig = set.networkConfig;
 
+var WIFICONF = './conf/wireless/wireless.conf';
+
 var RASPBERRY = 'raspberry';
 var ARDUINO_GALILEO = 'arduinogalileo';
 
@@ -76,19 +78,21 @@ function wifi(functie)
 	}
 	else
 	{
-	var WIFIFORM = path.join(__dirname,'conf',config.board,'/wireless/wireless_form.conf');
+		var FORM = 'wireless_form.conf';
+		if (networkConfig.psk.length==0) FORM = 'wireless-open_form.conf';
+	var WIFIFORM = path.join(__dirname,'conf',config.board,'/wireless/'+FORM);
 	if (!fs.existsSync(WIFIFORM)) 
 	{
 		//console.log('Board specific WiFi Form not found, using default');
 		console.log ('Board specific WiFi Form not found, using default');
-		WIFIFORM = path.join(__dirname,'conf/wireless/wireless_form.conf');
+		WIFIFORM = path.join(__dirname,'conf/wireless/'+FORM);
 	}
 	try
 	{
 		var wifiData = fs.readFileSync(WIFIFORM);
 		//console.log("wifidata = "+networkConfig.ssid);
-		var fileWifi = ejs.render (wifiData.toString(), {ssid:networkConf.ssid,
-							scan_ssid:networkConf.scan_ssid, psk:networkConf.psk});
+		var fileWifi = ejs.render (wifiData.toString(), {ssid:networkConfig.ssid,
+							scan_ssid:networkConfig.scan_ssid, psk:networkConfig.psk});
 		try
 		{
 			fs.writeFileSync(WIFICONF, fileWifi);

diff --git a/wxmpp.js b/wxmpp.js
@@ -51,13 +51,15 @@ function connect()
 			connection.connection.socket.setTimeout (0);
 			connection.connection.socket.setKeepAlive (true, 100);
 		}
+		connection.ping = true;
 		connecting = false;
 		loadSettings ();
 		connection.on ('error', function(error)
 		{
-			//console.log ('error');
+			console.log ('XMPP error');
 			if (!connecting)
 			{
+				clearInterval (connection.interval);
 				reconnect ();
 				console.error (error);
 				isConnected = false;
@@ -66,9 +68,10 @@ function connect()
 
 		connection.on ('disconnect', function()
 		{
-			//console.log ('disconnect');
+			console.log ('XMPP disconnect');
 			if (!connecting)
 			{
+				clearInterval (connection.interval);
 				reconnect ();
 		  		console.error ('disconnect');
 		  		isConnected = false;
@@ -78,9 +81,10 @@ function connect()
 
 		connection.on ('close', function()
 		{
-			//console.log ('close');
+			console.log ('XMPP close');
 			if (!connecting)
 			{
+				clearInterval (connection.interval);
 				reconnect ();
 		  		console.error ('disconnect');
 		  		isConnected = false;
@@ -92,6 +96,34 @@ function connect()
 			delay = 100;
 			isConnected = true;
 			connecting=false;
+			connection.interval = setInterval (function ()
+			{
+				if (!connection.nr) connection.nr = 0;
+			    if (connection.ping)
+			    {
+			        connection.nr = 0;
+			        connection.ping = false;
+			    }
+			    else
+			    {
+			        connection.nr ++;
+			    }
+			    // console.log ('ping nr '+connection.nr);
+			    if (connection.nr > 50)
+			    {
+			    	try
+			    	{
+			        	connection.nr = 0;
+			        	connection.disconnect ();
+			        }
+			        catch (e)
+			        {
+			        	isConnected = false;
+			        	clearInterval (connection.interval);
+			        	reconnect ();
+			        }
+			    }
+			}, 1000);
 		  //console.log (networkConfig.jid+"> online");
 		  connection.send(new xmpp.Element('presence',
 		           {}).
@@ -117,9 +149,10 @@ function connect()
 
 		connection.on ('end', function ()
 		{
-			//console.log ('end');
+			console.log ('XMPP end');
 			if (!connecting)
 			{
+				clearInterval (connection.interval);
 				isConnected = false;
 				reconnect ();
 			}
@@ -190,7 +223,7 @@ function ownerUnavailable()
 function reconnect ()
 {
 	connecting = true;
-	//console.log ('reconnecting '+delay);
+	console.log ('reconnecting '+delay);
 	setTimeout (function ()
 	{
 		delay = delay * 2;

diff --git a/xmpp_library.js b/xmpp_library.js
@@ -19,20 +19,10 @@ xmpp.Client.prototype.load = function (t, wother,buffer)
         {
         	bufferSize = buffer;
         }
-        // this.on ('iq', function (stanza)
-        // {
-        //         var p = stanza.getChild ('ping', 'urn:xmpp:ping');
-        //		console.log (stanza.root().toString());
-	//         console.log ('stanza');
-        //         if (p && p.type == 'get')
-        //         {
-        //                 console.log ('ping');
-        //                 t.send (new xmpp.Element ('iq', {to:p.attrs.from, type:'result', id:p.attrs.id}).c('ping', {xmlns:'urn:xmpp:ping'}));
-        //         }
-        // });
 
         this.on ('stanza', function (stanza)
         {
+                t.ping = true;
                 // console.log ('received = '+stanza.toString());
                 if (stanza.is('iq'))
                 {