Update strophe.ping.js, add XMPP ping handler

Author: ayyghost

index.html

@@ -21,6 +21,7 @@
     <script type="application/javascript" src="js/lib/strophe/strophe.ibb.js"></script>
     <script type="application/javascript" src="js/lib/strophe/strophe.si-filetransfer.js"></script>
     <script type="application/javascript" src="js/lib/strophe/strophe.muc.js"></script>
+    <script type="application/javascript" src="js/lib/strophe/strophe.ping.js"></script>
     <script type="application/javascript" src="js/lib/crypto-js.js"></script>
     <script type="application/javascript" src="js/lib/salsa20.js"></script>
     <script type="application/javascript" src="js/lib/eventemitter.js"></script>

js/etc/xmpp.js

@@ -381,11 +381,16 @@ $(window).ready(function() {
 
     // Executed (manually) after connection.
     var afterConnect = function() {
-        $('.conversationName').animate({ 'background-color': '#bb7a20' });
+        Cryptodog.xmpp.connection.ping.addPingHandler(function(ping) {
+            Cryptodog.xmpp.connection.ping.pong(ping);
+            return true;
+        });
 
         Cryptodog.xmpp.connection.ibb.addIBBHandler(Cryptodog.otr.ibbHandler);
         Cryptodog.xmpp.connection.si_filetransfer.addFileHandler(Cryptodog.otr.fileHandler);
 
+        $('.conversationName').animate({ 'background-color': '#bb7a20' });
+
         Cryptodog.xmpp.sendStatus();
         Cryptodog.xmpp.sendPublicKey();
         Cryptodog.xmpp.requestPublicKey();

js/lib/strophe/strophe.ping.js

@@ -1,53 +1,91 @@
-Strophe.addConnectionPlugin('connectionmanager', {
-  
-	pingTime: 12000, // the time in ms between each ping
-	timeoutTime: 6000,	// the time in ms to wait for a ping to return
-	pingInterval: null,
-	connection: null,
-	failedPings: 0,
-	
-	init: function(connection) {
-		this.connection = connection
-	},
-	
-	// Called automatically by Strophe when the connection status changes
-	statusChanged: function(status) {
-		var self = this
-		switch(status) {
-			case Strophe.Status.CONNECTED:
-			case Strophe.Status.ATTACHED:
-				// start monitoring the connection
-				clearInterval(this.pingInterval)
-				this.pingInterval = setInterval(function(){ self.pingServer() }, this.pingTime)
-				break
-			case Strophe.Status.DISCONNECTED:
-				// stop monitoring the connection
-				this.failedPings = 0
-				clearInterval(this.pingInterval)
-				break
-		}
-	},
-	
-	pingServer: function() {
-		var self = this
-		var stanza = $iq({
-			id:	"ping",
-			type: "get",
-			to:	this.connection.domain
-		}).c("ping", {xmlns: 'urn:xmpp:ping'})
-		
-		this.connection.sendIQ(stanza, null, function(){ self.requestTimedOut() }, this.timeoutTime)
-	},
-	
-	requestTimedOut: function() {
-		this.failedPings++
-		console.log('FP')
-		if (this.failedPings === 2) {
-			this.failedPings = 0
-			clearInterval(this.pingInterval)
-			console.log('FP!')
-			this.connection.disconnect()
-		}
-	}
+/*
+* Based on Ping Strophejs plugins (https://github.com/metajack/strophejs-plugins/tree/master/ping)
+* This plugin is distributed under the terms of the MIT licence.
+* Please see the LICENCE file for details.
+*
+* Copyright (c) Markus Kohlhase, 2010
+* Refactored by Pavel Lang, 2011
+* AMD Support added by Thierry
+*/
+/**
+* File: strophe.ping.js
+* A Strophe plugin for XMPP Ping ( http://xmpp.org/extensions/xep-0199.html )
+*/
+(function (root, factory) {
+    if (typeof define === 'function' && define.amd) {
+        // AMD. Register as an anonymous module.
+        define([
+            "strophe.js"
+        ], function (Strophe) {
+            factory(
+                Strophe.Strophe,
+                Strophe.$build,
+                Strophe.$iq ,
+                Strophe.$msg,
+                Strophe.$pres
+            );
+            return Strophe;
+        });
+    } else {
+        // Browser globals
+        factory(
+            root.Strophe,
+            root.$build,
+            root.$iq ,
+            root.$msg,
+            root.$pres
+        );
+    }
+}(this, function (Strophe, $build, $iq, $msg, $pres) {
+    Strophe.addConnectionPlugin('ping', {
+        _c: null,
 
-})
+        // called by the Strophe.Connection constructor
+        init: function(conn) {
+            this._c = conn;
+            Strophe.addNamespace('PING', "urn:xmpp:ping");
+        },
+
+        /**
+         * Function: ping
+         *
+         * Parameters:
+         * (String) to - The JID you want to ping
+         * (Function) success - Callback function on success
+         * (Function) error - Callback function on error
+         * (Integer) timeout - Timeout in milliseconds
+         */
+        ping: function(jid, success, error, timeout) {
+            var id = this._c.getUniqueId('ping');
+            var iq = $iq({type: 'get', to: jid, id: id}).c(
+                            'ping', {xmlns: Strophe.NS.PING});
+            this._c.sendIQ(iq, success, error, timeout);
+        },
+
+        /**
+         * Function: pong
+         *
+         * Parameters:
+         * (Object) ping - The ping stanza from the server.
+         */
+        pong: function(ping) {
+            var from = ping.getAttribute('from');
+            var id = ping.getAttribute('id');
+            var iq = $iq({type: 'result', to: from,id: id});
+            this._c.sendIQ(iq);
+        },
+
+        /**
+         * Function: addPingHandler
+         *
+         * Parameters:
+         * (Function) handler - Ping handler
+         *
+         * Returns:
+         * A reference to the handler that can be used to remove it.
+         */
+        addPingHandler: function(handler) {
+            return this._c.addHandler(handler, Strophe.NS.PING, "iq", "get");
+        }
+    });
+}));