quickblox 2.20.0 → 2.21.0-alpha.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "quickblox",
   "description": "QuickBlox JavaScript SDK",
-  "version": "2.20.0",
+  "version": "2.21.0-alpha.1",
   "homepage": "https://quickblox.com/developers/Javascript",
   "main": "src/qbMain.js",
   "types": "quickblox.d.ts",

package/quickblox.d.ts

@@ -141,6 +141,7 @@ export declare interface QBConfig {
     ) => void
   }
   pingTimeout?: number
+  pingDebug?: boolean
   pingLocalhostTimeInterval?: number
   chatReconnectionTimeInterval?: number
 }

package/quickblox.js

@@ -55079,7 +55079,7 @@ module.exports = StreamManagement;
 
 var config = {
   version: '2.20.0',
-  buildNumber: '1165',
+  buildNumber: '1166',
   creds: {
     'appId': 0,
     'authKey': '',
@@ -55101,6 +55101,7 @@ var config = {
     active: 2
   },
   pingTimeout: 1,
+  pingDebug: false,
   pingLocalhostTimeInterval: 5,
   chatReconnectionTimeInterval: 3,
   webrtc: {
@@ -55206,6 +55207,9 @@ module.exports = config;
 var config = require('./qbConfig');
 var Utils = require('./qbUtils');
 const MessageProxy = require("./modules/chat/qbMessage");
+const Chat = require("./modules/chat/qbChat");
+const DialogProxy = require("./modules/chat/qbDialog");
+const WebRTCClient = require("./modules/webrtc/qbWebRTCClient");
 
 // Actual QuickBlox API starts here
 function QuickBlox() {}
@@ -55318,6 +55322,7 @@ QuickBlox.prototype = {
                 config.urls.type
             ].join('');
             // account settings
+            var self = this;
             this.service.ajax({
                 url: accountSettingsUrl
             }, function (err, response) {
@@ -55329,6 +55334,26 @@ QuickBlox.prototype = {
                         }
                     };
                     config.set(update);
+                    //
+                    self.chat = new Chat(self.service);
+                    self.chat.dialog = new DialogProxy(self.service);
+                    self.chat.message = new MessageProxy(self.service);
+                    //
+                    if (Utils.getEnv().browser) {
+                        /** add adapter.js*/
+                        require('webrtc-adapter');
+
+                        /** add WebRTC API if API is avaible */
+                        if( Utils.isWebRTCAvailble() ) {
+                            var WebRTCClient = require('./modules/webrtc/qbWebRTCClient');
+                            self.webrtc = new WebRTCClient(self.service, self.chat);
+                        } else {
+                            self.webrtc = false;
+                        }
+                    } else {
+                        self.webrtc = false;
+                    }
+                    //
                 }
             });
         }
@@ -55755,13 +55780,58 @@ ServiceProxy.prototype = {
 
                 self.handleResponse(null, body, callback, retry);
             }
+            // if (self._fetchingSettings) {
+            //     self._fetchingSettings = false;
+            //     while (self._queue.length) {
+            //         var args = self._queue.shift();
+            //         self.ajax.apply(self, args);
+            //     }
+            // }
+            //
             if (self._fetchingSettings) {
                 self._fetchingSettings = false;
+
+                var sharedApiHost  =  'api.quickblox.com';
+                var sharedChatHost = 'chat.quickblox.com';
+
+                sharedApiHost  = sharedApiHost.replace(/^https?:\/\//i, '').replace(/\/+$/, '');
+                sharedChatHost = sharedChatHost.replace(/^https?:\/\//i, '').replace(/\/+$/, '');
+
+                var RE_SHARED_API  = new RegExp('^https?://' + sharedApiHost.replace(/\./g, '\\.') + '(?=[:/]|$)', 'i');
+                var RE_SHARED_CHAT = new RegExp('^https?://' + sharedChatHost.replace(/\./g, '\\.') + '(?=[:/]|$)', 'i');
+
+                var newApiHost  = (self.qbInst.config.endpoints.api  || '').replace(/^https?:\/\//i, '').replace(/\/+$/, '');
+                var newChatHost = (self.qbInst.config.endpoints.chat || '').replace(/^https?:\/\//i, '').replace(/\/+$/, '');
+                var NEW_API_URL  = 'https://' + newApiHost;
+                var NEW_CHAT_URL = 'https://' + newChatHost;
+
                 while (self._queue.length) {
-                    var args = self._queue.shift();
+                    var args = self._queue.shift();   // [params, callback]
+                    var p = args && args[0];
+
+                    if (p && typeof p.url === 'string') {
+                        var url = p.url;
+                        var changed = false;
+
+                        if (RE_SHARED_API.test(url)) {
+                            url = url.replace(RE_SHARED_API, NEW_API_URL);
+                            changed = true;
+                        }
+                        if (RE_SHARED_CHAT.test(url)) {
+                            url = url.replace(RE_SHARED_CHAT, NEW_CHAT_URL);
+                            changed = true;
+                        }
+
+                        if (changed) {
+                            p.url = url;
+                        }
+                    }
+
                     self.ajax.apply(self, args);
                 }
             }
+
+            //
         }
 
         function retry(session) {
@@ -56029,9 +56099,68 @@ var Utils = {
     },
 
     QBLog: function(){
+        var argsArr = Array.prototype.slice.call(arguments);
+
+        function containsPing(x) {
+            var needle = 'ping';
+
+            try {
+                if (x == null) return false;
+
+                if (typeof x === 'string') {
+                    return x.toLowerCase().indexOf(needle) !== -1;
+                }
+
+                if (typeof x === 'number' || typeof x === 'boolean') {
+                    return false;
+                }
+
+                if (typeof x === 'object') {
+                    //DELETE XEP-0198 SM packages from log:
+                    // <r xmlns="urn:xmpp:sm:3"/> and <a xmlns="urn:xmpp:sm:3" h="..."/>
+                    if (typeof x.outerHTML === 'string') {
+                        var oh = x.outerHTML.replace(/\s+/g, ' ').toLowerCase();
+                        if (
+                            oh.indexOf('urn:xmpp:sm:3') !== -1 &&
+                            (/^<\s*r\b/.test(oh) || /^<\s*a\b/.test(oh))
+                        ) {
+                            return true;
+                        }
+                    }
+
+                    var candidates = [
+                        x.textContent,
+                        x.innerHTML,
+                        x.outerHTML,
+                        x.nodeName,
+                        x.tagName,
+                        x.id
+                    ];
+
+                    for (var j = 0; j < candidates.length; j++) {
+                        var s = candidates[j];
+                        if (typeof s === 'string' && s.toLowerCase().indexOf(needle) !== -1) {
+                            return true;
+                        }
+                    }
+                }
+            } catch (_) {}
+
+            return false;
+        }
+
+
+        let shouldSuppressPing1 =
+            config && config.pingDebug === false;
+        let shouldSuppressPing2 =argsArr.some(containsPing);
+
+        let shouldSuppressPing = shouldSuppressPing1 && shouldSuppressPing2;
+
         if (this.loggers) {
             for (var i=0; i<this.loggers.length; ++i) {
-                this.loggers[i](arguments);
+                if (!shouldSuppressPing) {
+                   this.loggers[i](arguments);
+                }
             }
 
             return;
@@ -56112,7 +56241,12 @@ var Utils = {
 
         if(this.loggers){
             for(var j=0;j<this.loggers.length;++j){
-                this.loggers[j](arguments);
+                // this.loggers[j](arguments);
+                //
+                if (!shouldSuppressPing) {
+                    this.loggers[j](arguments);
+                }
+                //
             }
         }
     },

package/src/qbConfig.js

@@ -13,7 +13,7 @@
 
 var config = {
   version: '2.20.0',
-  buildNumber: '1165',
+  buildNumber: '1166',
   creds: {
     'appId': 0,
     'authKey': '',
@@ -35,6 +35,7 @@ var config = {
     active: 2
   },
   pingTimeout: 1,
+  pingDebug: false,
   pingLocalhostTimeInterval: 5,
   chatReconnectionTimeInterval: 3,
   webrtc: {

package/src/qbMain.js

@@ -9,6 +9,9 @@
 var config = require('./qbConfig');
 var Utils = require('./qbUtils');
 const MessageProxy = require("./modules/chat/qbMessage");
+const Chat = require("./modules/chat/qbChat");
+const DialogProxy = require("./modules/chat/qbDialog");
+const WebRTCClient = require("./modules/webrtc/qbWebRTCClient");
 
 // Actual QuickBlox API starts here
 function QuickBlox() {}
@@ -121,6 +124,7 @@ QuickBlox.prototype = {
                 config.urls.type
             ].join('');
             // account settings
+            var self = this;
             this.service.ajax({
                 url: accountSettingsUrl
             }, function (err, response) {
@@ -132,6 +136,26 @@ QuickBlox.prototype = {
                         }
                     };
                     config.set(update);
+                    //
+                    self.chat = new Chat(self.service);
+                    self.chat.dialog = new DialogProxy(self.service);
+                    self.chat.message = new MessageProxy(self.service);
+                    //
+                    if (Utils.getEnv().browser) {
+                        /** add adapter.js*/
+                        require('webrtc-adapter');
+
+                        /** add WebRTC API if API is avaible */
+                        if( Utils.isWebRTCAvailble() ) {
+                            var WebRTCClient = require('./modules/webrtc/qbWebRTCClient');
+                            self.webrtc = new WebRTCClient(self.service, self.chat);
+                        } else {
+                            self.webrtc = false;
+                        }
+                    } else {
+                        self.webrtc = false;
+                    }
+                    //
                 }
             });
         }

package/src/qbProxy.js

@@ -276,13 +276,58 @@ ServiceProxy.prototype = {
 
                 self.handleResponse(null, body, callback, retry);
             }
+            // if (self._fetchingSettings) {
+            //     self._fetchingSettings = false;
+            //     while (self._queue.length) {
+            //         var args = self._queue.shift();
+            //         self.ajax.apply(self, args);
+            //     }
+            // }
+            //
             if (self._fetchingSettings) {
                 self._fetchingSettings = false;
+
+                var sharedApiHost  =  'api.quickblox.com';
+                var sharedChatHost = 'chat.quickblox.com';
+
+                sharedApiHost  = sharedApiHost.replace(/^https?:\/\//i, '').replace(/\/+$/, '');
+                sharedChatHost = sharedChatHost.replace(/^https?:\/\//i, '').replace(/\/+$/, '');
+
+                var RE_SHARED_API  = new RegExp('^https?://' + sharedApiHost.replace(/\./g, '\\.') + '(?=[:/]|$)', 'i');
+                var RE_SHARED_CHAT = new RegExp('^https?://' + sharedChatHost.replace(/\./g, '\\.') + '(?=[:/]|$)', 'i');
+
+                var newApiHost  = (self.qbInst.config.endpoints.api  || '').replace(/^https?:\/\//i, '').replace(/\/+$/, '');
+                var newChatHost = (self.qbInst.config.endpoints.chat || '').replace(/^https?:\/\//i, '').replace(/\/+$/, '');
+                var NEW_API_URL  = 'https://' + newApiHost;
+                var NEW_CHAT_URL = 'https://' + newChatHost;
+
                 while (self._queue.length) {
-                    var args = self._queue.shift();
+                    var args = self._queue.shift();   // [params, callback]
+                    var p = args && args[0];
+
+                    if (p && typeof p.url === 'string') {
+                        var url = p.url;
+                        var changed = false;
+
+                        if (RE_SHARED_API.test(url)) {
+                            url = url.replace(RE_SHARED_API, NEW_API_URL);
+                            changed = true;
+                        }
+                        if (RE_SHARED_CHAT.test(url)) {
+                            url = url.replace(RE_SHARED_CHAT, NEW_CHAT_URL);
+                            changed = true;
+                        }
+
+                        if (changed) {
+                            p.url = url;
+                        }
+                    }
+
                     self.ajax.apply(self, args);
                 }
             }
+
+            //
         }
 
         function retry(session) {

package/src/qbUtils.js

@@ -171,9 +171,68 @@ var Utils = {
     },
 
     QBLog: function(){
+        var argsArr = Array.prototype.slice.call(arguments);
+
+        function containsPing(x) {
+            var needle = 'ping';
+
+            try {
+                if (x == null) return false;
+
+                if (typeof x === 'string') {
+                    return x.toLowerCase().indexOf(needle) !== -1;
+                }
+
+                if (typeof x === 'number' || typeof x === 'boolean') {
+                    return false;
+                }
+
+                if (typeof x === 'object') {
+                    //DELETE XEP-0198 SM packages from log:
+                    // <r xmlns="urn:xmpp:sm:3"/> and <a xmlns="urn:xmpp:sm:3" h="..."/>
+                    if (typeof x.outerHTML === 'string') {
+                        var oh = x.outerHTML.replace(/\s+/g, ' ').toLowerCase();
+                        if (
+                            oh.indexOf('urn:xmpp:sm:3') !== -1 &&
+                            (/^<\s*r\b/.test(oh) || /^<\s*a\b/.test(oh))
+                        ) {
+                            return true;
+                        }
+                    }
+
+                    var candidates = [
+                        x.textContent,
+                        x.innerHTML,
+                        x.outerHTML,
+                        x.nodeName,
+                        x.tagName,
+                        x.id
+                    ];
+
+                    for (var j = 0; j < candidates.length; j++) {
+                        var s = candidates[j];
+                        if (typeof s === 'string' && s.toLowerCase().indexOf(needle) !== -1) {
+                            return true;
+                        }
+                    }
+                }
+            } catch (_) {}
+
+            return false;
+        }
+
+
+        let shouldSuppressPing1 =
+            config && config.pingDebug === false;
+        let shouldSuppressPing2 =argsArr.some(containsPing);
+
+        let shouldSuppressPing = shouldSuppressPing1 && shouldSuppressPing2;
+
         if (this.loggers) {
             for (var i=0; i<this.loggers.length; ++i) {
-                this.loggers[i](arguments);
+                if (!shouldSuppressPing) {
+                   this.loggers[i](arguments);
+                }
             }
 
             return;
@@ -254,7 +313,12 @@ var Utils = {
 
         if(this.loggers){
             for(var j=0;j<this.loggers.length;++j){
-                this.loggers[j](arguments);
+                // this.loggers[j](arguments);
+                //
+                if (!shouldSuppressPing) {
+                    this.loggers[j](arguments);
+                }
+                //
             }
         }
     },