quickblox 2.24.1-alpha.0 → 2.24.1-alpha.1

package/src/modules/chat/qbChat.js

@@ -11,6 +11,13 @@ var chatUtils = require('./qbChatHelpers'),
 
 var unsupportedError = 'This function isn\'t supported outside of the browser (...yet)';
 
+/**
+ * [CROS-1061] How long to wait for the server to answer a Notice enable/disable
+ * IQ before reporting an error to the caller. Without a bound the callback is
+ * never invoked when the server stays silent.
+ */
+var NOTICE_IQ_TIMEOUT_MS = 10000;
+
 var XMPP;
 
 /** create StropheJS or NodeXMPP connection object */
@@ -1852,6 +1859,22 @@ ChatProxy.prototype = {
         self._isConnecting = false;
         self._sessionHasExpired = false;
 
+        // [CROS-1061] A new XMPP session never carries the previous session's
+        // Notice subscription: the server binds <enable xmlns="urn:xmpp:notice:0"/>
+        // to the stream, so it is gone once the stream is gone. Without this
+        // reset the flag stays `true` after a transport reconnect while no
+        // notices are delivered any more, and isNoticesEnabled() misleads the
+        // application into skipping the re-enable (verified against a live
+        // server: socket break -> reconnect -> flag true, zero notice stanzas;
+        // clearing the flag and re-sending <enable> restored delivery).
+        //
+        // Placed in the shared preamble, above the isInitialConnect branch, and
+        // above the onReconnectListener call below: with
+        // config.pingLocalhostTimeInterval === 0 that listener fires
+        // synchronously from this function, and a consumer re-enabling notices
+        // from it must not observe a stale `true`.
+        self._isNoticesEnabled = false;
+
         self._enableCarbons();
 
         if (isInitialConnect) {
@@ -1862,7 +1885,6 @@ ChatProxy.prototype = {
             self._isConnectionVerified = true;
             self._isReconnectListenerPending = false;
 
-            // TODO(2.25.0): auto-enable Notice Feature here (see qbChat.js enableNotices JSDoc).
             self.roster.get(function (contacts) {
                 xmppClient.send(presence);
 
@@ -1870,7 +1892,24 @@ ChatProxy.prototype = {
                 callback(self.roster.contacts);
             });
         } else {
+            // [CROS-1061] Union of the rooms still tracked on this instance and
+            // the ones an explicit reconnect() had to drop. Consumed once —
+            // clearing it here keeps a later session (or another user after
+            // logout) from resurrecting a stale list.
+            //
+            // Safe to build the join stanzas at this point: setUserCurrentJid()
+            // above has already installed the new JID, and muc.join() derives
+            // the presence `from` out of it. Moving this block above that call
+            // would send from="".
             var rooms = Object.keys(self.muc.joinedRooms);
+            var remembered = self.muc._roomsToRejoin || [];
+
+            for (var r = 0; r < remembered.length; r++) {
+                if (rooms.indexOf(remembered[r]) === -1) {
+                    rooms.push(remembered[r]);
+                }
+            }
+            self.muc._roomsToRejoin = [];
 
             xmppClient.send(presence);
 
@@ -2093,6 +2132,11 @@ ChatProxy.prototype = {
         // connection had a chance to verify itself.
         this._isConnectionVerified = false;
         this._isReconnectListenerPending = false;
+        // [CROS-1061] Remember the rooms before dropping them, so the re-join
+        // loop in _postConnectActions has something to restore. Without this the
+        // list is lost and group dialogs stop receiving message-level notices
+        // until the page is reloaded.
+        this.muc._roomsToRejoin = Object.keys(this.muc.joinedRooms);
         this.muc.joinedRooms = {};
         this.helpers.setUserCurrentJid('');
 
@@ -2486,6 +2530,9 @@ ChatProxy.prototype = {
         this._checkConnectionTimer = undefined;
         this._checkExpiredSessionTimer = undefined;
         this.muc.joinedRooms = {};
+        // [CROS-1061] Never carry rooms across a logout: re-joining the previous
+        // user's rooms from a new JID is answered with 403/407 by the server.
+        this.muc._roomsToRejoin = [];
         // [QC-1550] Reset XMPP verification state on explicit disconnect so the
         // next connect() starts from a clean slate. _isLogout guard below also
         // prevents firing of deferred listeners if a pong arrives in flight,
@@ -2520,17 +2567,26 @@ ChatProxy.prototype = {
      * NoticeCreatedDialog / NoticeUpdatedDialog / NoticeDeletedDialog
      * headline stanzas.
      *
-     * The local enabled flag is reset to false on chat disconnect — consumers
-     * must call enableNotices() again after a reconnect (intentional divergence
-     * from the Android SDK, which auto-restores the subscription).
+     * The subscription belongs to the XMPP session, so it does not survive a
+     * reconnect: the local enabled flag is reset to false whenever a new session
+     * is established (initial connect and every reconnect alike) as well as on
+     * disconnect. Consumers must call enableNotices() again after a reconnect —
+     * an intentional divergence from the Android SDK, which auto-restores the
+     * subscription. Reacting to onReconnectListener is the supported way to do
+     * that.
      *
-     * TODO(2.25.0): make auto-enable SDK-internal — fire on initial connect and
-     * on relogin after session-expired, skip on Stream-Management reconnect.
-     * Spec & three-state matrix are tracked in the internal 2.25.0 backlog
-     * (auto-enable notices).
+     * Concurrent calls are safe: each IQ carries its own unique id, responses
+     * are dispatched per id, and the flag is set independently for each result.
+     * Calling enableNotices() again before the previous callback fires is
+     * therefore allowed — for example when a second reconnect arrives while the
+     * first enable is still in flight.
      *
-     * Do not call enableNotices again before the previous callback fires —
-     * concurrent enable calls are not specified.
+     * If the server does not answer, the callback receives an error after a
+     * timeout instead of never being called.
+     *
+     * TODO(2.25.0): make auto-enable SDK-internal — fire on initial connect and
+     * on every reconnect. Spec & three-state matrix are tracked in the internal
+     * 2.25.0 backlog (auto-enable notices).
      *
      * @memberof QB.chat
      * @param {enableNoticesCallback} callback - Called with (error, result) on IQ result.
@@ -2569,7 +2625,10 @@ ChatProxy.prototype = {
      * Returns the local Notice Feature subscription flag.
      * @memberof QB.chat
      * @return {Boolean} true after a successful enableNotices(), false otherwise.
-     *   Reset to false on chat disconnect; not synchronized with the server.
+     *   Reset to false on disconnect and whenever a new XMPP session is
+     *   established, so after a reconnect it reports false until the consumer
+     *   enables notices again. Not synchronized with the server: it reflects
+     *   what this client last requested, not the server's own state.
      * @since 2.24.0
      */
     isNoticesEnabled: function () {
@@ -2622,10 +2681,34 @@ ChatProxy.prototype = {
         }
 
         if (Utils.getEnv().browser) {
-            self.connection.sendIQ(iq, _onSuccess, _onError);
+            // [CROS-1061] Without the 4th argument Strophe never times the IQ out,
+            // so a server that stays silent leaves the caller without any callback
+            // at all — the application spins forever. On timeout Strophe calls
+            // _onError(null), which reports a 'cancel' error and leaves the flag
+            // untouched.
+            //
+            // Note: this covers "server does not answer". It does NOT cover
+            // "socket died", because the timeout is an addTimedHandler and
+            // connection.reset() (called from the DISCONNECTED branch) clears
+            // timedHandlers. That case is covered by the consumer-side timeout.
+            self.connection.sendIQ(iq, _onSuccess, _onError, NOTICE_IQ_TIMEOUT_MS);
         } else {
             // Node/NativeScript path: register callback in nodeStanzasCallbacks map.
+            // This path does not go through sendIQ, so the timeout is ours to run.
+            var noticeIqTimer = setTimeout(function () {
+                // Drop the pending entry first: _onIQ only dispatches while the
+                // entry exists, so a late answer after this point is ignored
+                // instead of invoking the callback a second time.
+                delete self.nodeStanzasCallbacks[iqParams.id];
+                _onError(null);
+            }, NOTICE_IQ_TIMEOUT_MS);
+
             self.nodeStanzasCallbacks[iqParams.id] = function (stanza) {
+                // Must be first: otherwise a timely answer still leaves the timer
+                // armed, and it would fire later and call the callback a second
+                // time with an error.
+                clearTimeout(noticeIqTimer);
+
                 // The map handler receives the result/error stanza. Inspect type to dispatch.
                 var iqType = chatUtils.getAttr(stanza, 'type');
                 if (iqType === 'result') {
@@ -2954,6 +3037,20 @@ function MucProxy(options) {
     this.nodeStanzasCallbacks = options.nodeStanzasCallbacks;
     //
     this.joinedRooms = {};
+
+    /**
+     * [CROS-1061] Rooms carried across an explicit QB.chat.reconnect().
+     *
+     * reconnect() has to clear joinedRooms — the new session holds no presence
+     * yet — but until now it dropped the list without keeping a copy, so the
+     * re-join loop in _postConnectActions found nothing to restore and group
+     * dialogs silently stopped receiving message-level notices.
+     *
+     * Written only by reconnect(), read and cleared once by _postConnectActions,
+     * and cleared by disconnect() so one user's rooms can never be re-joined
+     * from another user's JID.
+     */
+    this._roomsToRejoin = [];
 }
 
 MucProxy.prototype = {

package/src/qbConfig.js

@@ -12,7 +12,7 @@
  */
 
 var config = {
-  version: '2.24.1-alpha.0',
+  version: '2.24.1-alpha.1',
   buildNumber: '1181',
   creds: {
     'appId': 0,