Skip to content

Commit

Permalink
version 2.15.1 created.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Artem-K-Koltunov
Artem-K-Koltunov committed Oct 7, 2022
1 parent 57fdd9f commit ae3be95
Show file tree
Hide file tree
Showing 6 changed files with 162 additions and 42 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Check out our [API Reference](https://quickblox.github.io/quickblox-javascript-s
## Dependencies for browser

```html
<script src="https://unpkg.com/quickblox@2.15.0/quickblox.min.js"></script>
<script src="https://unpkg.com/quickblox@2.15.1/quickblox.min.js"></script>
```

## Bower and RequireJS
Expand Down
100 changes: 80 additions & 20 deletions quickblox.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46246,20 +46246,10 @@ ChatProxy.prototype = {
' error: ', error);
self._localPingFaildCounter += 1;
if (self._localPingFaildCounter > 6) {
// TODO: check in [CROS-823]
self.isOnline(function () {
Utils.QBLog('[QBChat]',
'Local Ping: ',
'connection failed, at ', Utils.getCurrentTime());
}, function () {
console.log("call _establishConnection ....");

self.isConnected = false;
self._isConnecting = false;
self._localPingFaildCounter = 0;
self._establishConnection(params);
});

self.isConnected = false;
self._isConnecting = false;
self._localPingFaildCounter = 0;
self._establishConnection(params);
}
} else {
Utils.QBLog('[QBChat]',
Expand Down Expand Up @@ -46287,9 +46277,6 @@ ChatProxy.prototype = {
var timeNow = new Date();
if (typeof config.qbTokenExpirationDate !== 'undefined') {
var timeLag = Math.round((timeNow.getTime() - config.qbTokenExpirationDate.getTime()) / (1000 * 60));
//artan 25-08-2022
// TODO: need to delete in task [CROS-823]
console.log('timeLag: ', timeLag);
if (timeLag >= 0) {
self._sessionHasExpired = true;
Utils.safeCallbackCall(self.onSessionExpiredListener, null);
Expand Down Expand Up @@ -46826,6 +46813,7 @@ ChatProxy.prototype = {
},

isOnline: function(no, yes) {
//
const server = 'chat.quickblox.com';
try {
this.ping(server, (error) => {
Expand All @@ -46839,6 +46827,77 @@ ChatProxy.prototype = {
no();
}
},
/*
isOnlineAction0: function(no, yes) {
const host = 'chat.quickblox.com';
try {
this.ping(host, function (error) {
console.log('isOnlineAction0 call ping');
if (error) {
console.log('call isOnlineAction0, ping - Failed, ', error);
no();
} else {
console.log('call isOnlineAction0, ping - OK');
yes();
}
});
} catch (err) {
console.log('call isOnlineAction0, Exception isOnlineAction0 function, ', err);
no();
}
},

isOnlineAction1: function(no, yes) {
try {
var jid = this.helpers.getUserCurrentJid();
console.log('JID: ', jid);
this.ping(
jid,
function (err) {
console.log('isOnlineAction1 call ping');
if (err) {
console.log('isOnlineAction1 call ping');
no();
}
else {
console.log('call isOnlineAction1, ping - OK');
yes();
}
}
);
} catch (e) {
console.log('call isOnlineAction1, Exception isOnlineAction1 function, ', e);
no();
}
},

isOnlineAction2: function(no, yes) {
var params = {
order: {
field: 'created_at',
sort: 'asc'
},
page: 1,
per_page: 10
};

try {
qbMain.users.listUsers(params, function(error, result){
if (error) {
console.log('isOnlineAction2 call ping');
no();
}
else {
console.log('call isOnlineAction2, ping - OK');
yes();
}
});
} catch(e) {
console.log('call isOnlineAction2, Exception isOnlineAction2 function, ', e);
no();
}
},
*/

ping: function (jid_or_user_id, callback) {
Utils.QBLog('[QBChat]', 'Call ping ');
Expand Down Expand Up @@ -53594,8 +53653,8 @@ module.exports = StreamManagement;
*/

var config = {
version: '2.15.0',
buildNumber: '1137',
version: '2.15.1',
buildNumber: '1139',
creds: {
'appId': 0,
'authKey': '',
Expand Down Expand Up @@ -53704,7 +53763,6 @@ config.updateSessionExpirationDate = function (tokenExpirationDate, headerHasTok
newDate.setMinutes ( newDate.getMinutes() + config.liveSessionInterval );
}
config.qbTokenExpirationDate = newDate;
console.log('updateSessionExpirationDate ... Set value: ', config.qbTokenExpirationDate);
};


Expand Down Expand Up @@ -54136,6 +54194,8 @@ ServiceProxy.prototype = {
typeof qbTokenExpirationDate === 'undefined');
qbTokenExpirationDate = (headerHasToken) ? qbTokenExpirationDate : new Date();
self.qbInst.config.updateSessionExpirationDate(qbTokenExpirationDate, headerHasToken);
Utils.QBLog('[Request][ajax]','header has token:',headerHasToken );
Utils.QBLog('[Request][ajax]','updateSessionExpirationDate ... Set value: ', self.qbInst.config.qbTokenExpirationDate );
}

if (qbDataType === 'text') {
Expand Down
2 changes: 1 addition & 1 deletion quickblox.min.js
View file

Large diffs are not rendered by default.

93 changes: 76 additions & 17 deletions src/modules/chat/qbChat.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -822,20 +822,10 @@ ChatProxy.prototype = {
' error: ', error);
self._localPingFaildCounter += 1;
if (self._localPingFaildCounter > 6) {
// TODO: check in [CROS-823]
self.isOnline(function () {
Utils.QBLog('[QBChat]',
'Local Ping: ',
'connection failed, at ', Utils.getCurrentTime());
}, function () {
console.log("call _establishConnection ....");

self.isConnected = false;
self._isConnecting = false;
self._localPingFaildCounter = 0;
self._establishConnection(params);
});

self.isConnected = false;
self._isConnecting = false;
self._localPingFaildCounter = 0;
self._establishConnection(params);
}
} else {
Utils.QBLog('[QBChat]',
Expand Down Expand Up @@ -863,9 +853,6 @@ ChatProxy.prototype = {
var timeNow = new Date();
if (typeof config.qbTokenExpirationDate !== 'undefined') {
var timeLag = Math.round((timeNow.getTime() - config.qbTokenExpirationDate.getTime()) / (1000 * 60));
//artan 25-08-2022
// TODO: need to delete in task [CROS-823]
console.log('timeLag: ', timeLag);
if (timeLag >= 0) {
self._sessionHasExpired = true;
Utils.safeCallbackCall(self.onSessionExpiredListener, null);
Expand Down Expand Up @@ -1402,6 +1389,7 @@ ChatProxy.prototype = {
},

isOnline: function(no, yes) {
//
const server = 'chat.quickblox.com';
try {
this.ping(server, (error) => {
Expand All @@ -1415,6 +1403,77 @@ ChatProxy.prototype = {
no();
}
},
/*
isOnlineAction0: function(no, yes) {
const host = 'chat.quickblox.com';
try {
this.ping(host, function (error) {
console.log('isOnlineAction0 call ping');
if (error) {
console.log('call isOnlineAction0, ping - Failed, ', error);
no();
} else {
console.log('call isOnlineAction0, ping - OK');
yes();
}
});
} catch (err) {
console.log('call isOnlineAction0, Exception isOnlineAction0 function, ', err);
no();
}
},
isOnlineAction1: function(no, yes) {
try {
var jid = this.helpers.getUserCurrentJid();
console.log('JID: ', jid);
this.ping(
jid,
function (err) {
console.log('isOnlineAction1 call ping');
if (err) {
console.log('isOnlineAction1 call ping');
no();
}
else {
console.log('call isOnlineAction1, ping - OK');
yes();
}
}
);
} catch (e) {
console.log('call isOnlineAction1, Exception isOnlineAction1 function, ', e);
no();
}
},
isOnlineAction2: function(no, yes) {
var params = {
order: {
field: 'created_at',
sort: 'asc'
},
page: 1,
per_page: 10
};
try {
qbMain.users.listUsers(params, function(error, result){
if (error) {
console.log('isOnlineAction2 call ping');
no();
}
else {
console.log('call isOnlineAction2, ping - OK');
yes();
}
});
} catch(e) {
console.log('call isOnlineAction2, Exception isOnlineAction2 function, ', e);
no();
}
},
*/

ping: function (jid_or_user_id, callback) {
Utils.QBLog('[QBChat]', 'Call ping ');
Expand Down
5 changes: 2 additions & 3 deletions src/qbConfig.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
*/

var config = {
version: '2.15.0',
buildNumber: '1137',
version: '2.15.1',
buildNumber: '1139',
creds: {
'appId': 0,
'authKey': '',
Expand Down Expand Up @@ -122,7 +122,6 @@ config.updateSessionExpirationDate = function (tokenExpirationDate, headerHasTok
newDate.setMinutes ( newDate.getMinutes() + config.liveSessionInterval );
}
config.qbTokenExpirationDate = newDate;
console.log('updateSessionExpirationDate ... Set value: ', config.qbTokenExpirationDate);
};


Expand Down
2 changes: 2 additions & 0 deletions src/qbProxy.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,8 @@ ServiceProxy.prototype = {
typeof qbTokenExpirationDate === 'undefined');
qbTokenExpirationDate = (headerHasToken) ? qbTokenExpirationDate : new Date();
self.qbInst.config.updateSessionExpirationDate(qbTokenExpirationDate, headerHasToken);
Utils.QBLog('[Request][ajax]','header has token:',headerHasToken );
Utils.QBLog('[Request][ajax]','updateSessionExpirationDate ... Set value: ', self.qbInst.config.qbTokenExpirationDate );
}

if (qbDataType === 'text') {
Expand Down

0 comments on commit ae3be95

Please sign in to comment.