Skip to content

Commit

Permalink
added automatic reply and context menu conditions on already-in-the-c…
Browse files Browse the repository at this point in the history 
…all state
  • Loading branch information
@terem42
terem42 committed Aug 19, 2016
1 parent df8bb0e commit 36fe053
Show file tree
Hide file tree
Showing 5 changed files with 57 additions and 22 deletions.
12 changes: 12 additions & 0 deletions jingle/README.md
View file
Expand Up @@ -36,3 +36,15 @@ To enable the plugin, add it's `init` method to your bootstrap (usually index.ht
CandyShop.Jingle.init(helper_srv_config);

```
## Debug
To get complete trace of WebRTC session all you need is minor update inside ` jingle/candy.js ` plugin.
Replace normal peerconnection with traceable one, as shown below:

```JavaScript

RTCPeerconnection = RTC.peerconnection;
//RTCPeerconnection = TraceablePeerConnection;

```
Next, you can open Javascript console (F12 in Mozilla/Chrome) and issue console.log(JSON.stringify(Candy.Core.getConnection().jingle.getLog()));
to see consolidated logs of all active jingle/WebRTC sessions.
47 changes: 28 additions & 19 deletions jingle/candy.js
View file
Expand Up @@ -9,7 +9,6 @@ var RTC = null;
var RTCPeerconnection = null;
CandyShop.Jingle = (function(self, Candy, $) {
_initiator = false,
_session = null,
_callinvite_accepted_ack = null,
_call_accepted_peerjid = null,
_peerjid = null,
Expand All @@ -23,15 +22,17 @@ CandyShop.Jingle = (function(self, Candy, $) {
_onTerminate.call(Candy.Core.getConnection().jingle,$stanza.attr('from'));
},
_displayError = function(reason) {
Candy.View.Pane.Chat.Modal.show($.i18n._('jingleReason-' + reason), true);
Candy.View.Pane.Chat.Modal.show($.i18n._('Communication error : '+reason), true);
},
_onTerminate = function(jid) {
if (_peerjid && Candy.View.Pane.Chat.rooms[_peerjid]) Candy.View.Pane.Room.close(_peerjid);
if (_session) {
//_session.sendTerminate();
try { _session.terminate(); } catch(e) {}
_session=null;
};
try {
if (Candy.Core.getConnection().jingle.jid2session.hasOwnProperty(_peerjid)) {
var sid = Candy.Core.getConnection().jingle.jid2session[_peerjid].sid;
Candy.Core.getConnection().jingle.terminate(sid);
}

} catch(e) {console.log("error while terminating session:"+e.stack);}
if (Candy.Core.getConnection().jingle.localStream) {
Candy.Core.getConnection().jingle.localStream.getTracks().forEach(function (track) {
console.log("stopping the track");
Expand Down Expand Up @@ -113,6 +114,10 @@ CandyShop.Jingle = (function(self, Candy, $) {
_onTerminate.call(Candy.Core.getConnection().jingle,_peerjid);
Candy.View.Pane.Chat.Modal.show($.i18n._('callInvitationDenied'), true, false);
break;
case 'callinvite-busy':
Candy.View.Pane.Chat.Modal.show($.i18n._('callInvitationBusy'), true, false);
_onTerminate.call(Candy.Core.getConnection().jingle,_peerjid);
break;
case 'callinvite-accepted':
Candy.View.Pane.Chat.Modal.show($.i18n._('callInvitationAccepted'), true, false);
getUserMediaWithConstraints(['audio', 'video']);
Expand Down Expand Up @@ -140,6 +145,11 @@ CandyShop.Jingle = (function(self, Candy, $) {
//var sess = conn.jingle.sessions[sid];
if (action == 'call-invitation') {
var ack = $iq({type: 'result', to: iq.getAttribute('from'), id: iq.getAttribute('id') });
if (_callinvite_accepted_ack) {
ack.c('jingle', {xmlns: 'urn:xmpp:jingle:1', action: 'callinvite-busy'});
conn.send(ack);
return;
}
var form_timeout = null;
Candy.View.Pane.Chat.Modal.show(Mustache.to_html(_CallAcceptTemplate, {
_label: $.i18n._('labelCallConfirm', [_nick]),
Expand Down Expand Up @@ -181,13 +191,12 @@ CandyShop.Jingle = (function(self, Candy, $) {
Candy.View.Translation.en.calling = 'Establishing video call...';
Candy.View.Translation.en.hangup = 'Hangup';
Candy.View.Translation.en.callTerminated = 'Recipient terminated the call.';
Candy.View.Translation.en.callInvitationSent = 'Sent call invitation, awaiting 30 seconds on response';
Candy.View.Translation.en.callInvitationAccepted = 'Call invitation has been accepted, initiating the call';
Candy.View.Translation.en.callInvitationDenied = 'Call invitation has been denied';
Candy.View.Translation.en.callInvitationTimeout = 'Timeout on sending call invitation';
Candy.View.Translation.en.callInvitationError = 'Error on sending call invitation ';
Candy.View.Translation.en['jingleReason-service-unavailable'] = 'Recipient does not support video.';
Candy.View.Translation.en['jingleReason-resource-constraint'] = 'Recipient is already in a call.';
Candy.View.Translation.en.callInvitationSent = 'Sent call invitation, awaiting 30 seconds on response.';
Candy.View.Translation.en.callInvitationAccepted = 'Call invitation has been accepted, initiating the call.';
Candy.View.Translation.en.callInvitationDenied = 'Call invitation has been denied.';
Candy.View.Translation.en.callInvitationBusy = 'Recipient is already in a call.';
Candy.View.Translation.en.callInvitationTimeout = 'Timeout on sending call invitation.';
Candy.View.Translation.en.callInvitationError = 'Error on sending call invitation.';
RTC = setupRTC();
if (RTC !== null) {
console.log("RTC had been initialized");
Expand Down Expand Up @@ -236,7 +245,7 @@ CandyShop.Jingle = (function(self, Candy, $) {
RTC.attachMediaStream($('#jingle-localView'), stream);
$('#jingle-icons').removeClass('hidden');
if (_initiator) {
_session = conn.jingle.initiate(_peerjid,conn.jid);
conn.jingle.initiate(_peerjid,conn.jid);
_call_accepted_peerjid = _peerjid;
}
else {
Expand All @@ -250,10 +259,10 @@ CandyShop.Jingle = (function(self, Candy, $) {

//--------------------------------------------------------------------
$(document).bind('callincoming.jingle', function(event, sid) {
_session = Candy.Core.getConnection().jingle.sessions[sid];
var sess = Candy.Core.getConnection().jingle.sessions[sid];
_initiator = false;
_session.sendAnswer();
_session.accept();
sess.sendAnswer();
sess.accept();
});
$(document).bind('callterminated.jingle', function(event, sid, reason) {
if (_showterminate) Candy.View.Pane.Chat.Modal.show($.i18n._('callTerminated'), true);
Expand Down Expand Up @@ -362,7 +371,7 @@ CandyShop.Jingle = (function(self, Candy, $) {
var jingle_menu_elem = {
requiredPermission: function(user, me) {
//console.log('ch0,user='+JSON.stringify(user, null, 2));
return me.getNick() !== user.getNick() && !Candy.Core.getUser().isInPrivacyList('ignore', user.getJid()) && RTC;
return me.getNick() !== user.getNick() && !Candy.Core.getUser().isInPrivacyList('ignore', user.getJid()) && RTC && !_peerjid;
},
'class': 'jingle',
'label': 'Video call',
Expand Down
3 changes: 1 addition & 2 deletions jingle/strophe.jingle.adapter.js
View file
Expand Up @@ -10,7 +10,6 @@ function TraceablePeerConnection(ice_config, constraints) {

// override as desired
this.trace = function(what, info) {
console.log("peerconn=>"+what+";"+info);
self.updateLog.push({
time: new Date(),
type: what,
Expand All @@ -26,7 +25,7 @@ function TraceablePeerConnection(ice_config, constraints) {
};
this.onaddstream = null;
this.peerconnection.onaddstream = function (event) {
self.trace('+++++++++++++++++++++++++++onaddstream', event.stream.id);
self.trace('onaddstream', event.stream.id);
if (self.onaddstream !== null) {
self.onaddstream(event);
}
Expand Down
16 changes: 16 additions & 0 deletions jingle/strophe.jingle.js
View file
Expand Up @@ -248,5 +248,21 @@ Strophe.addConnectionPlugin('jingle', {
}
);
// implement push?
},
getLog: function () {
var data = {};
var self = this;
Object.keys(this.sessions).forEach(function (sid) {
var session = self.sessions[sid];
if (session.peerconnection && session.peerconnection.updateLog) {
// FIXME: should probably be a .dump call
data["jingle_" + session.sid] = {
updateLog: session.peerconnection.updateLog,
stats: session.peerconnection.stats,
url: window.location.href
};
}
});
return data;
}
});
1 change: 0 additions & 1 deletion jingle/strophe.jingle.session.js
View file
Expand Up @@ -66,7 +66,6 @@ JingleSession.prototype.initiate = function (peerjid, isInitiator) {
try {
this.peerconnection = new RTCPeerconnection(this.ice_config,this.pc_constraints);
//this.peerconnection = new TraceablePeerConnection(this.ice_config,this.pc_constraints);
Candy.Core.getConnection().jingle.updateLog = this.peerconnection.updateLog;
} catch (e) {
console.error('Failed to create PeerConnection, exception: ',
e.message);
Expand Down

0 comments on commit 36fe053

Please sign in to comment.