quickblox 2.23.1-beta.6 → 2.24.0-beta.1

package/src/modules/chat/qbDialog.js

@@ -39,9 +39,11 @@ DialogProxy.prototype = {
     },
 
     /**
-     * Create new dialog({@link https://docs.quickblox.com/docs/js-chat-dialogs#create-dialog read more}).
+     * Create new dialog({@link https://docs.quickblox.com/reference/create-dialog read more}).
      * @memberof QB.chat.dialog
      * @param {Object} params - Object of parameters.
+     * @param {Number[]|String} [params.admin_ids] - IDs of dialog admins for public/group dialogs.
+     * Ignored by the backend for private dialogs.
      * @param {createDialogCallback} callback - The callback function.
      * */
     create: function(params, callback) {
@@ -56,6 +58,10 @@ DialogProxy.prototype = {
             params.occupants_ids = params.occupants_ids.join(', ');
         }
 
+        if (params && params.admin_ids && Utils.isArray(params.admin_ids)) {
+            params.admin_ids = params.admin_ids.join(', ');
+        }
+
         if (params && params.is_join_required !== undefined && params.is_join_required !== null) {
             if (params.is_join_required !== 0 && params.is_join_required !== 1) {
                 Utils.QBLog('[QBChat]', 'Warning: is_join_required must be 0 or 1, got: ' +
@@ -72,10 +78,13 @@ DialogProxy.prototype = {
     },
 
     /**
-     * Update group dialog({@link https://docs.quickblox.com/docs/js-chat-dialogs#update-dialog read more}).
+     * Update group dialog({@link https://docs.quickblox.com/reference/update-dialog read more}).
      * @memberof QB.chat.dialog
      * @param {String} id - The dialog ID.
      * @param {Object} params - Object of parameters.
+     * @param {Number[]|String} [params.admin_ids] - Full replacement list of dialog admins.
+     * @param {Object} [params.push_all] - Incremental fields to append, including admin_ids.
+     * @param {Object} [params.pull_all] - Incremental fields to remove, including admin_ids.
      * @param {updateDialogCallback} callback - The callback function.
      * */
     update: function(id, params, callback) {

package/src/modules/chat/qbMessage.js

@@ -17,6 +17,9 @@ MessageProxy.prototype = {
      * Get a chat history({@link https://docs.quickblox.com/docs/js-chat-messaging#retrieve-chat-history read more}).
      * @memberof QB.chat.message
      * @param {Object} params - Object of parameters.
+     * @param {Number} [params.include_reactions] - Include message reactions in the response.
+     *   Allowed values: 0 (default, no reactions data) or 1 (include reactions[] per message).
+     *   Reactions array shape: [{ name, count, user_ids: number[] }].
      * @param {listMessageCallback} callback - The callback function.
      * */
     list: function(params, callback) {
@@ -114,6 +117,129 @@ MessageProxy.prototype = {
         }
     },
 
+    /**
+     * Get a chat message by ID
+     * ({@link https://docs.quickblox.com/reference/get-message-by-id read more}).
+     * @memberof QB.chat.message
+     * @param {String} id - The message id.
+     * @param {Object} [params] - Optional query parameters.
+     * @param {Number} [params.include_reactions] - Include message reactions in the response (0 or 1).
+     * @param {getByIdMessageCallback} callback - The callback function.
+     * @since 2.24.0
+     * */
+    getById: function(id, params_or_callback, callback) {
+        /**
+         * Callback for QB.chat.message.getById().
+         * @param {Object} error - The error object.
+         * @param {Object} message - The message object.
+         * @callback getByIdMessageCallback
+         * */
+
+        var ajaxParams = {
+            url: Utils.getUrl(MESSAGES_API_URL, id)
+        };
+
+        if (arguments.length === 2) {
+            this.service.ajax(ajaxParams, params_or_callback);
+        } else if (arguments.length === 3) {
+            ajaxParams.data = params_or_callback;
+
+            this.service.ajax(ajaxParams, callback);
+        }
+    },
+
+    /**
+     * Add reaction to a message.
+     * @memberof QB.chat.message
+     * @param {String} id - The message id.
+     * @param {String} name - The reaction name.
+     * @param {addReactionCallback} callback - The callback function.
+     *
+     * Server contract:
+     *   POST /chat/Message/{id}/reactions
+     *   Success: 201 Created with empty body.
+     *   Errors: 400 (invalid id/name or reaction limits), 404 (message not found), 422 (public dialog).
+     *
+     * Idempotency note: Re-adding the same reaction by the same user returns 201 without creating a duplicate reaction.
+     * */
+    addReaction: function(id, name, callback) {
+        /**
+         * Callback for QB.chat.message.addReaction().
+         * @param {Object} error - The error object.
+         * @param {Object|undefined} reaction - Empty response body on success.
+         * @callback addReactionCallback
+         * */
+
+        // Server returns 201 with empty body. Use dataType:'text' so qbProxy does
+        // not try to JSON.parse the empty response (which throws in node-fetch).
+        this.service.ajax({
+            url: Utils.getUrl(MESSAGES_API_URL + '/' + id + '/reactions'),
+            type: 'POST',
+            contentType: 'application/json; charset=utf-8',
+            isNeedStringify: true,
+            dataType: 'text',
+            data: {
+                name: name
+            }
+        }, callback);
+    },
+
+    /**
+     * Remove reaction from a message.
+     * @memberof QB.chat.message
+     * @param {String} id - The message id.
+     * @param {String} name - The reaction name.
+     * @param {removeReactionCallback} callback - The callback function.
+     *
+     * Server contract:
+     *   DELETE /chat/Message/{id}/reactions
+     *   Success: 200 OK with empty body.
+     *   Errors: 400 (invalid id/name), 404 (message not found or reaction not found).
+     * */
+    removeReaction: function(id, name, callback) {
+        /**
+         * Callback for QB.chat.message.removeReaction().
+         * @param {Object} error - The error object.
+         * @param {String} response - Empty body.
+         * @callback removeReactionCallback
+         * */
+
+        this.service.ajax({
+            url: Utils.getUrl(MESSAGES_API_URL + '/' + id + '/reactions'),
+            type: 'DELETE',
+            contentType: 'application/json; charset=utf-8',
+            isNeedStringify: true,
+            dataType: 'text',
+            data: {
+                name: name
+            }
+        }, callback);
+    },
+
+    /**
+     * Get reactions list for a message.
+     * @memberof QB.chat.message
+     * @param {String} id - The message id.
+     * @param {listReactionsCallback} callback - The callback function.
+     *
+     * Server contract:
+     *   GET /chat/Message/{id}/reactions
+     *   Success: 200 OK, body { total_entries: Number, items: Array<{ name, count, user_ids[] }> }.
+     *   Errors: 400 (invalid id), 404 (message not found).
+     * */
+    listReactions: function(id, callback) {
+        /**
+         * Callback for QB.chat.message.listReactions().
+         * @param {Object} error - The error object.
+         * @param {Object} reactions - The reactions aggregate object.
+         * @callback listReactionsCallback
+         * */
+
+        this.service.ajax({
+            url: Utils.getUrl(MESSAGES_API_URL + '/' + id + '/reactions')
+        }, callback);
+    },
+
     /**
      * Get unread messages counter for one or group of dialogs({@link https://docs.quickblox.com/docs/js-chat-dialogs#get-number-of-unread-messages read more}).
      * @memberof QB.chat.message

package/src/modules/chat/qbNoticeConsts.js

@@ -0,0 +1,32 @@
+'use strict';
+
+/**
+ * Shared constants for the Notice Feature (XMPP `urn:xmpp:notice:0`).
+ *
+ * Foundation module for SDK 2.24.0 — imported by Notice / Reaction / Admin Role
+ * runtime modules in their respective feature branches. No runtime behavior here.
+ *
+ * Mirror of Android `com.quickblox.chat.notice.QBNoticeConsts`.
+ */
+
+/**
+ * XMPP namespace for Notice IQ stanzas (`<enable>`, `<disable>`) and for the
+ * `<moduleIdentifier>` element on inbound notice messages.
+ */
+var NOTICE_NAMESPACE = 'urn:xmpp:notice:0';
+
+/**
+ * Discriminator strings carried in the `<moduleIdentifier>` element of
+ * inbound notice stanzas. Used for routing in the headline-message handler.
+ */
+var NOTICE_MODULE_IDENTIFIER = {
+    UPDATED_MESSAGE: 'NoticeUpdatedMessage',
+    DELETED_MESSAGE: 'NoticeDeletedMessage',
+    UPDATED_DIALOG:  'NoticeUpdatedDialog',
+    DELETED_DIALOG:  'NoticeDeletedDialog'
+};
+
+module.exports = {
+    NOTICE_NAMESPACE: NOTICE_NAMESPACE,
+    NOTICE_MODULE_IDENTIFIER: NOTICE_MODULE_IDENTIFIER
+};

package/src/modules/webrtc/qbRTCPeerConnection.js

@@ -542,110 +542,92 @@ function _getStats(peer, lastResults, successCallback, errorCallback) {
 
     peer.getStats(null).then(function (results) {
         results.forEach(function (result) {
-            _applyStatReport(statistic, result, lastResults);
+            var item;
+
+            if (result.bytesReceived && result.type === 'inbound-rtp') {
+                item = statistic.remote[result.mediaType];
+                item.bitrate = _getBitratePerSecond(result, lastResults, false);
+                item.bytesReceived = result.bytesReceived;
+                item.packetsReceived = result.packetsReceived;
+                item.timestamp = result.timestamp;
+                if (result.mediaType === 'video' && result.framerateMean) {
+                    item.framesPerSecond = Math.round(result.framerateMean * 10) / 10;
+                }
+            } else if (result.bytesSent && result.type === 'outbound-rtp') {
+                item = statistic.local[result.mediaType];
+                item.bitrate = _getBitratePerSecond(result, lastResults, true);
+                item.bytesSent = result.bytesSent;
+                item.packetsSent = result.packetsSent;
+                item.timestamp = result.timestamp;
+                if (result.mediaType === 'video' && result.framerateMean) {
+                    item.framesPerSecond = Math.round(result.framerateMean * 10) / 10;
+                }
+            } else if (result.type === 'local-candidate') {
+                item = statistic.local.candidate;
+                if (result.candidateType === 'host' && result.mozLocalTransport === 'udp' && result.transport === 'udp') {
+                    item.protocol = result.transport;
+                    item.ip = result.ipAddress;
+                    item.port = result.portNumber;
+                } else if (!Helpers.getVersionFirefox()) {
+                    item.protocol = result.protocol;
+                    item.ip = result.ip;
+                    item.port = result.port;
+                }
+            } else if (result.type === 'remote-candidate') {
+                item = statistic.remote.candidate;
+                item.protocol = result.protocol || result.transport;
+                item.ip = result.ip || result.ipAddress;
+                item.port = result.port || result.portNumber;
+            } else if (result.type === 'track' && result.kind === 'video' && !Helpers.getVersionFirefox()) {
+                if (result.remoteSource) {
+                    item = statistic.remote.video;
+                    item.frameHeight = result.frameHeight;
+                    item.frameWidth = result.frameWidth;
+                    item.framesPerSecond = _getFramesPerSecond(result, lastResults, false);
+                } else {
+                    item = statistic.local.video;
+                    item.frameHeight = result.frameHeight;
+                    item.frameWidth = result.frameWidth;
+                    item.framesPerSecond = _getFramesPerSecond(result, lastResults, true);
+                }
+            }
         });
         successCallback(statistic, results);
     }, errorCallback);
-}
 
-function _applyStatReport(statistic, result, lastResults) {
-    var item;
-    // mediaType is deprecated in the W3C webrtc-stats spec and replaced by kind.
-    // Safari/WebKit omits mediaType on some reports and provides only kind, so we
-    // normalize once and use it for both the statistic lookup and the 'video' check.
-    var mediaType = result.mediaType || result.kind;
-
-    if (result.bytesReceived && result.type === 'inbound-rtp') {
-        item = statistic.remote[mediaType];
-
-        if (item) {
-            item.bitrate = _getBitratePerSecond(result, lastResults, false);
-            item.bytesReceived = result.bytesReceived;
-            item.packetsReceived = result.packetsReceived;
-            item.timestamp = result.timestamp;
-            if (mediaType === 'video' && result.framerateMean) {
-                item.framesPerSecond = Math.round(result.framerateMean * 10) / 10;
-            }
-        } else {
-            Helpers.traceWarning('_getStats: skipping inbound-rtp report with unknown mediaType/kind: ' + mediaType);
-        }
-    } else if (result.bytesSent && result.type === 'outbound-rtp') {
-        item = statistic.local[mediaType];
-
-        if (item) {
-            item.bitrate = _getBitratePerSecond(result, lastResults, true);
-            item.bytesSent = result.bytesSent;
-            item.packetsSent = result.packetsSent;
-            item.timestamp = result.timestamp;
-            if (mediaType === 'video' && result.framerateMean) {
-                item.framesPerSecond = Math.round(result.framerateMean * 10) / 10;
-            }
-        } else {
-            Helpers.traceWarning('_getStats: skipping outbound-rtp report with unknown mediaType/kind: ' + mediaType);
-        }
-    } else if (result.type === 'local-candidate') {
-        item = statistic.local.candidate;
-        if (result.candidateType === 'host' && result.mozLocalTransport === 'udp' && result.transport === 'udp') {
-            item.protocol = result.transport;
-            item.ip = result.ipAddress;
-            item.port = result.portNumber;
-        } else if (!Helpers.getVersionFirefox()) {
-            item.protocol = result.protocol;
-            item.ip = result.ip;
-            item.port = result.port;
-        }
-    } else if (result.type === 'remote-candidate') {
-        item = statistic.remote.candidate;
-        item.protocol = result.protocol || result.transport;
-        item.ip = result.ip || result.ipAddress;
-        item.port = result.port || result.portNumber;
-    } else if (result.type === 'track' && result.kind === 'video' && !Helpers.getVersionFirefox()) {
-        if (result.remoteSource) {
-            item = statistic.remote.video;
-            item.frameHeight = result.frameHeight;
-            item.frameWidth = result.frameWidth;
-            item.framesPerSecond = _getFramesPerSecond(result, lastResults, false);
+    function _getBitratePerSecond(result, lastResults, isLocal) {
+        var lastResult = lastResults && lastResults.get(result.id),
+            seconds = lastResult ? ((result.timestamp - lastResult.timestamp) / 1000) : 5,
+            kilo = 1024,
+            bit = 8,
+            bitrate;
+
+        if (!lastResult) {
+            bitrate = 0;
+        } else if (isLocal) {
+            bitrate = bit * (result.bytesSent - lastResult.bytesSent) / (kilo * seconds);
         } else {
-            item = statistic.local.video;
-            item.frameHeight = result.frameHeight;
-            item.frameWidth = result.frameWidth;
-            item.framesPerSecond = _getFramesPerSecond(result, lastResults, true);
+            bitrate = bit * (result.bytesReceived - lastResult.bytesReceived) / (kilo * seconds);
         }
-    }
-}
 
-function _getBitratePerSecond(result, lastResults, isLocal) {
-    var lastResult = lastResults && lastResults.get(result.id),
-        seconds = lastResult ? ((result.timestamp - lastResult.timestamp) / 1000) : 5,
-        kilo = 1024,
-        bit = 8,
-        bitrate;
-
-    if (!lastResult) {
-        bitrate = 0;
-    } else if (isLocal) {
-        bitrate = bit * (result.bytesSent - lastResult.bytesSent) / (kilo * seconds);
-    } else {
-        bitrate = bit * (result.bytesReceived - lastResult.bytesReceived) / (kilo * seconds);
+        return Math.round(bitrate);
     }
 
-    return Math.round(bitrate);
-}
+    function _getFramesPerSecond(result, lastResults, isLocal) {
+        var lastResult = lastResults && lastResults.get(result.id),
+            seconds = lastResult ? ((result.timestamp - lastResult.timestamp) / 1000) : 5,
+            framesPerSecond;
 
-function _getFramesPerSecond(result, lastResults, isLocal) {
-    var lastResult = lastResults && lastResults.get(result.id),
-        seconds = lastResult ? ((result.timestamp - lastResult.timestamp) / 1000) : 5,
-        framesPerSecond;
+        if (!lastResult) {
+            framesPerSecond = 0;
+        } else if (isLocal) {
+            framesPerSecond = (result.framesSent - lastResult.framesSent) / seconds;
+        } else {
+            framesPerSecond = (result.framesReceived - lastResult.framesReceived) / seconds;
+        }
 
-    if (!lastResult) {
-        framesPerSecond = 0;
-    } else if (isLocal) {
-        framesPerSecond = (result.framesSent - lastResult.framesSent) / seconds;
-    } else {
-        framesPerSecond = (result.framesReceived - lastResult.framesReceived) / seconds;
+        return Math.round(framesPerSecond * 10) / 10;
     }
-
-    return Math.round(framesPerSecond * 10) / 10;
 }
 
 // Find the line in sdpLines[startLine...endLine - 1] that starts with |prefix|
@@ -832,7 +814,4 @@ function setMediaBitrate(sdp, media, bitrate) {
     return newLines.join('\n');
 }
 
-// PRIVATE - exposed for unit tests only, not part of the public SDK contract.
-qbRTCPeerConnection._applyStatReport = _applyStatReport;
-
 module.exports = qbRTCPeerConnection;

package/src/qbConfig.js

@@ -12,7 +12,7 @@
  */
 
 var config = {
-  version: '2.23.1-beta.6',
+  version: '2.24.0-beta.1',
   buildNumber: '1179',
   creds: {
     'appId': 0,

package/src/plugins/streamManagement.js

@@ -1,235 +0,0 @@
-'use strict';
-
-/**
- * QuickBlox JavaScript SDK
- * Chat Stream Management plugin
- * doc: http://xmpp.org/extensions/xep-0198.html
- *
- * To enable this features add to config
- * ```javascript
- * streamManagement: {
- -    enable: true
- - }
- * ```
- *
- * Uses listener by QB.chat.onSentMessageCallback
- *
- * ```javascript
- * QB.chat.onSentMessageCallback = function (messageLost, messageSent) {
- *     if (messageLost) {
- *         console.error('sendErrorCallback', messageLost);
- *     } else {
- *         console.info('sendMessageSuccessCallback', messageSent);
- *     }
- * };
- * ```
- */
-
-/** JSHint inline rules */
-/* globals $build */
-
-var Utils = require('../qbUtils'),
-    chatUtils = require('../modules/chat/qbChatHelpers');
-
-function StreamManagement(options) {
-
-    this._NS = 'urn:xmpp:sm:3';
-
-    this._isStreamManagementEnabled = false;
-
-    // Counter of the incoming stanzas
-    this._clientProcessedStanzasCounter = null;
-
-    // The client send stanza counter.
-    this._clientSentStanzasCounter = null;
-
-    this._intervalId = null;
-    
-    this._timeInterval = Utils.getTimeIntervalForCallBackMessage();
-
-    this.sentMessageCallback = null;
-
-    if(Utils.getEnv().browser){
-        this._parser = new DOMParser();
-    }
-
-    // connection
-    this._c = null;
-
-    this._nodeBuilder = null;
-    // Original connection.send method
-    this._originalSend = null;
-
-    // In progress stanzas queue
-    this._stanzasQueue = [];
-}
-
-
-StreamManagement.prototype.enable = function (connection, client) {
-    var self = this,
-        stanza,
-        enableParams = {
-            xmlns: self._NS
-        };
-
-    if(!self._isStreamManagementEnabled){
-        self._c = connection;
-        self._originalSend = this._c.send;
-        self._c.send = this.send.bind(self);
-    }
-
-    if(Utils.getEnv().browser){
-        this._clientProcessedStanzasCounter = null;
-        this._clientSentStanzasCounter = null;
-        self._addEnableHandlers();
-        stanza = $build('enable', enableParams);
-    } else {
-        self._nodeBuilder =  client.Stanza;
-        self._addEnableHandlers();
-        stanza = chatUtils.createStanza(self._nodeBuilder, enableParams, 'enable');
-    }
-
-    self._c.send(stanza);
-};
-
-StreamManagement.prototype._timeoutCallback = function () {
-    var self = this,
-        now = Date.now(),
-        updatedStanzasQueue = [];
-
-    if(self._stanzasQueue.length){
-        for(var i = 0; i < self._stanzasQueue.length; i++){
-            if(self._stanzasQueue[i] && self._stanzasQueue[i].time < now){
-                self.sentMessageCallback(self._stanzasQueue[i].message);
-            } else {
-                updatedStanzasQueue.push(self._stanzasQueue[i]);
-            }
-        }
-
-        self._stanzasQueue = updatedStanzasQueue;
-    }
-};
-
-StreamManagement.prototype._addEnableHandlers = function () {
-    var self = this;
-
-    if (Utils.getEnv().browser) {
-        self._c.XAddTrackedHandler(_incomingStanzaHandler.bind(self));
-    } else {
-        self._c.on('stanza', _incomingStanzaHandler.bind(self));
-    }
-
-    function _incomingStanzaHandler (stanza){
-        /*
-        * Getting incoming stanza tagName
-        * */
-
-        var tagName = stanza.name || stanza.tagName || stanza.nodeTree.tagName;
-
-        if(tagName === 'enabled'){
-            self._isStreamManagementEnabled = true;
-
-            return true;
-        }
-
-        if (self._isStreamManagementEnabled && tagName === 'message') {
-            clearInterval(self._intervalId);
-            self._intervalId = setInterval(self._timeoutCallback.bind(self), self._timeInterval);
-
-            return true;
-        }
-
-        if(chatUtils.getAttr(stanza, 'xmlns') !== self._NS){
-            self._increaseReceivedStanzasCounter();
-        }
-
-        if(tagName === 'r'){
-            var params = {
-                    xmlns: self._NS,
-                    h: self._clientProcessedStanzasCounter
-                },
-                answerStanza = Utils.getEnv().browser ? $build('a', params) :
-                    chatUtils.createStanza(self._nodeBuilder, params, 'a');
-
-            self._originalSend.call(self._c, answerStanza);
-
-            return true;
-        }
-
-        if(tagName === 'a'){
-            var h = parseInt(chatUtils.getAttr(stanza, 'h'));
-
-            self._checkCounterOnIncomeStanza(h);
-        }
-
-        return true;
-    }
-};
-
-StreamManagement.prototype.send = function (stanza, message) {
-    var self = this,
-        stanzaXML = stanza.nodeTree ? this._parser.parseFromString(stanza.nodeTree.outerHTML, "application/xml").childNodes[0] : stanza,
-        tagName = stanzaXML.name || stanzaXML.tagName || stanzaXML.nodeTree.tagName,
-        type = chatUtils.getAttr(stanzaXML, 'type'),
-        bodyContent = chatUtils.getElementText(stanzaXML, 'body') || '',
-        attachments = chatUtils.getAllElements(stanzaXML, 'attachment') || '';
-
-    try {
-        self._originalSend.call(self._c, stanza);
-    } catch (e) {
-        Utils.QBLog('[QBChat]', e.message);
-    } finally {
-        if (tagName === 'message' && (type === 'chat' || type === 'groupchat') && (bodyContent || attachments.length)) {
-            self._sendStanzasRequest({
-                message: message,
-                time: Date.now() + self._timeInterval,
-                expect: self._clientSentStanzasCounter
-            });
-        }
-    
-        self._clientSentStanzasCounter++;
-    }
-
-};
-
-StreamManagement.prototype._sendStanzasRequest = function (data) {
-    var self = this;
-
-    if(self._isStreamManagementEnabled){
-        self._stanzasQueue.push(data);
-
-        var stanza = Utils.getEnv().browser ? $build('r', { xmlns: self._NS }) :
-            chatUtils.createStanza(self._nodeBuilder, { xmlns: self._NS }, 'r');
-
-        if (self._c.connected) {
-            self._originalSend.call(self._c, stanza);
-        } else {
-            self._checkCounterOnIncomeStanza();
-        }
-    }
-};
-
-StreamManagement.prototype.getClientSentStanzasCounter = function(){
-    return this._clientSentStanzasCounter;
-};
-
-StreamManagement.prototype._checkCounterOnIncomeStanza = function (count){
-    var updatedStanzasQueue = [];
-
-    if(this._stanzasQueue.length){
-        for(var i = 0; i < this._stanzasQueue.length; i++){
-            if(this._stanzasQueue[i].expect == count){
-                this.sentMessageCallback(null, this._stanzasQueue[i].message);
-            } else {
-                updatedStanzasQueue.push(this._stanzasQueue[i]);
-            }
-        }
-        this._stanzasQueue = updatedStanzasQueue;
-    }
-};
-
-StreamManagement.prototype._increaseReceivedStanzasCounter = function(){
-    this._clientProcessedStanzasCounter++;
-};
-
-module.exports = StreamManagement;