Skip to content

QBWEBSDK-125 ( WebRTC: Extra params null issue ) #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dimaspirit wants to merge 1 commit into from
Closed

QBWEBSDK-125 ( WebRTC: Extra params null issue ) #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@
# npm packages
node_modules
npm-debug.log

# *Storm
.idea/
1 change: 0 additions & 1 deletion .idea/.name
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/jsLibraryMappings.xml
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions .idea/libraries/quickblox_javascript_sdk_node_modules.xml
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions .idea/misc.xml
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/modules.xml
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions .idea/quickblox-javascript-sdk.iml
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml
View file
Open in desktop

This file was deleted.

458 changes: 172 additions & 286 deletions .idea/workspace.xml
View file
Open in desktop

Large diffs are not rendered by default.

91 changes: 55 additions & 36 deletions js/modules/qbWebRTC.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ function WebRTCProxy(service, conn) {

this._getExtension = function(extraParams) {
var extension = {}, iceCandidates = [], opponents = [],
candidate, oponnent, items, childrenNodes;
candidate, opponent, items, childrenNodes;

if (extraParams) {
for (var i = 0, len = extraParams.childNodes.length; i < len; i++) {
Expand All @@ -188,8 +188,8 @@ function WebRTCProxy(service, conn) {
// opponentsIDs
items = extraParams.childNodes[i].childNodes;
for (var j = 0, len2 = items.length; j < len2; j++) {
oponnent = items[j].textContent;
opponents.push(oponnent);
opponent = items[j].textContent;
opponents.push(opponent);
}

} else {
Expand Down Expand Up @@ -377,13 +377,14 @@ WebRTCProxy.prototype._createPeer = function(params) {
};

WebRTCProxy.prototype.call = function(opponentsIDs, callType, extension) {
var self = this;

extension = self.helpers.prepareExtension(extension);

trace('Call. userId: ' + opponentsIDs + ", callType: " + callType + ', extension: ' + JSON.stringify(extension));

this._createPeer();

var self = this;

// For now we support only 1-1 calls.
//
var userIdsToCall = opponentsIDs instanceof Array ? opponentsIDs : [opponentsIDs];
Expand Down Expand Up @@ -413,9 +414,12 @@ WebRTCProxy.prototype.call = function(opponentsIDs, callType, extension) {
};

WebRTCProxy.prototype.accept = function(userId, extension) {
var extension = extension || {};
var self = this,
ext = extension || {};

trace('Accept. userId: ' + userId + ', extension: ' + JSON.stringify(extension));
ext = self.helpers.prepareExtension(ext);

trace('Accept. userId: ' + userId + ', extension: ' + JSON.stringify(ext));

clearAnswerTimer(userId);

Expand All @@ -428,53 +432,62 @@ WebRTCProxy.prototype.accept = function(userId, extension) {
// delete callers[userId];
}

var self = this;
peer.opponentId = userId;

peer.getSessionDescription(function(err, res) {
if (err) {
trace(err);
} else {
self._sendMessage(userId, extension, 'ACCEPT');
self._sendMessage(userId, ext, 'ACCEPT');
}
});
};

WebRTCProxy.prototype.reject = function(userId, extension) {
var extension = extension || {};
var self = this,
ext = extension || {};

ext = self.helpers.prepareExtension(ext);

trace('Reject. userId: ' + userId + ', extension: ' + JSON.stringify(extension));
trace('Reject. userId: ' + userId + ', extension: ' + JSON.stringify(ext));

clearAnswerTimer(userId);

if (callers[userId]) {
extension.sessionID = callers[userId].sessionID;
ext.sessionID = callers[userId].sessionID;
delete callers[userId];
}

this._sendMessage(userId, extension, 'REJECT');
this._sendMessage(userId, ext, 'REJECT');
};

WebRTCProxy.prototype.stop = function(userId, extension) {
var extension = extension || {};
var self = this,
ext = extension || {};

trace('Stop. userId: ' + userId + ', extension: ' + JSON.stringify(extension));
ext = self.helpers.prepareExtension(ext);

trace('Stop. userId: ' + userId + ', extension: ' + JSON.stringify(ext));

clearAnswerTimer(userId);
clearDialingTimerInterval(userId);
clearCallTimer(userId);

this._sendMessage(userId, extension, 'STOP');
this._close();
self._sendMessage(userId, ext, 'STOP');
self._close();

clearCallers(userId);
};

WebRTCProxy.prototype.update = function(userId, extension) {
var extension = extension || {};
trace('Update. userId: ' + userId + ', extension: ' + JSON.stringify(extension));
var self = this,
ext = extension || {};

ext = self.helpers.prepareExtension(ext);

trace('Update. userId: ' + userId + ', extension: ' + JSON.stringify(ext));

this._sendMessage(userId, extension, 'PARAMETERS_CHANGED');
self._sendMessage(userId, ext, 'PARAMETERS_CHANGED');
};

// close peer connection and local stream
Expand All @@ -498,26 +511,28 @@ WebRTCProxy.prototype._sendCandidate = function(userId, iceCandidates) {
};

WebRTCProxy.prototype._sendMessage = function(userId, extension, type, callType, opponentsIDs) {
var extension = extension || {},
var ext = extension || {},
self = this,
msg, params;

extension.moduleIdentifier = WEBRTC_MODULE_ID;
extension.signalType = signalingType[type];
extension.sessionID = peer && peer.sessionID || extension.sessionID;
ext = self.helpers.prepareExtension(ext);

ext.moduleIdentifier = WEBRTC_MODULE_ID;
ext.signalType = signalingType[type];
ext.sessionID = peer && peer.sessionID || ext.sessionID;

if (callType) {
extension.callType = callType === 'video' ? '1' : '2';
ext.callType = callType === 'video' ? '1' : '2';
}

if (type === 'CALL' || type === 'ACCEPT') {
extension.sdp = peer.localDescription.sdp;
extension.platform = 'web';
if (type === 'CALL' || type === 'ACCEPT') {
ext.sdp = peer.localDescription.sdp;
ext.platform = 'web';
}

if (type === 'CALL') {
extension.callerID = this.helpers.getIdFromNode(connection.jid);
extension.opponentsIDs = opponentsIDs;
ext.callerID = this.helpers.getIdFromNode(connection.jid);
ext.opponentsIDs = opponentsIDs;
}

params = {
Expand All @@ -531,12 +546,12 @@ WebRTCProxy.prototype._sendMessage = function(userId, extension, type, callType,
xmlns: Strophe.NS.CLIENT
});

Object.keys(extension).forEach(function(field) {
Object.keys(ext).forEach(function(field) {
if (field === 'iceCandidates') {

// iceCandidates
msg = msg.c('iceCandidates');
extension[field].forEach(function(candidate) {
ext[field].forEach(function(candidate) {
msg = msg.c('iceCandidate');
Object.keys(candidate).forEach(function(key) {
msg.c(key).t(candidate[key]).up();
Expand All @@ -549,17 +564,17 @@ WebRTCProxy.prototype._sendMessage = function(userId, extension, type, callType,

// opponentsIDs
msg = msg.c('opponentsIDs');
extension[field].forEach(function(opponentId) {
ext[field].forEach(function(opponentId) {
msg = msg.c('opponentID').t(opponentId).up();
});
msg.up();

} else if (typeof extension[field] === 'object') {
} else if (typeof ext[field] === 'object') {

self._JStoXML(field, extension[field], msg);
self._JStoXML(field, ext[field], msg);

} else {
msg.c(field).t(extension[field]).up();
msg.c(field).t(ext[field]).up();
}
});

Expand Down Expand Up @@ -732,6 +747,10 @@ Helpers.prototype = {
getIdFromNode: function(jid) {
if (jid.indexOf('@') < 0) return null;
return parseInt(jid.split('@')[0].split('-')[0]);
},

prepareExtension: function(extension) {
return JSON.parse( JSON.stringify(extension).replace(/null/g, "\"\"") );
}

};
Expand Down
Loading