From efd2545bd20d5445df01756ac9aef964af347c63 Mon Sep 17 00:00:00 2001
From: paweldomas <pawel.domas@jitsi.org>
Date: Fri, 28 Aug 2015 04:25:42 -0500
Subject: [PATCH] Will use XEP-0199 ping for keep-alive only if it  is
 supported by the server.

---
 modules/xmpp/strophe.ping.js | 20 ++++++++++++++++++++
 modules/xmpp/xmpp.js         | 13 +++++++++++--
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/modules/xmpp/strophe.ping.js b/modules/xmpp/strophe.ping.js
index b11f65119..1ac534595 100644
--- a/modules/xmpp/strophe.ping.js
+++ b/modules/xmpp/strophe.ping.js
@@ -53,6 +53,26 @@ module.exports = function (XMPP, eventEmitter) {
             this.connection.sendIQ(iq, success, error, timeout);
         },
 
+        /**
+         * Checks if given <tt>jid</tt> has XEP-0199 ping support.
+         * @param jid the JID to be checked for ping support.
+         * @param callback function with boolean argument which will be
+         * <tt>true</tt> if XEP-0199 ping is supported by given <tt>jid</tt>
+         */
+        hasPingSupport: function (jid, callback) {
+            this.connection.disco.info(
+                jid, null,
+                function (result) {
+                    var ping = $(result).find('>>feature[var="urn:xmpp:ping"]');
+                    callback(ping.length > 0);
+                },
+                function (error) {
+                    console.error("Ping feature discovery error", error);
+                    callback(false);
+                }
+            );
+        },
+
         /**
          * Starts to send ping in given interval to specified remote JID.
          * This plugin supports only one such task and <tt>stopInterval</tt>
diff --git a/modules/xmpp/xmpp.js b/modules/xmpp/xmpp.js
index ff0e7a65f..4aba26b36 100644
--- a/modules/xmpp/xmpp.js
+++ b/modules/xmpp/xmpp.js
@@ -113,8 +113,17 @@ XMPP.prototype._connect = function (jid, password) {
 
             logger.info("My Jabber ID: " + self.connection.jid);
 
-            self.connection.ping.startInterval(
-                Strophe.getDomainFromJid(self.connection.jid));
+            // Schedule ping ?
+            var pingJid = config.hosts.domain;
+            connection.ping.hasPingSupport(
+                pingJid,
+                function (hasPing) {
+                    if (hasPing)
+                        connection.ping.startInterval(pingJid);
+                    else
+                        console.warn("Ping NOT supported by " + pingJid);
+                }
+            );
             
             if (password)
                 authenticatedUser = true;