Skip to content

O
Openfire
Commit 950acddc authored by Dele Olajide's avatar Dele Olajide Committed by dele
Browse files
Options

Rayo plugin - implemented call hold/unhold 

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@13777 b35dd754-fafc-0310-a699-88a17e54d16e
parent 20569c21
Show whitespace changes
Inline Side-by-side
Showing with 327 additions and 77 deletions
src/plugins/rayo/src/demo/candybar.css
View file @ 950acddc
......@@ -94,6 +94,20 @@ body {
-ms-filter: progid:DXImageTransform.Microsoft.Shadow(Color=rgba(0, 0, 0, 0.2),Direction=135,Strength=5); }
#callStatus.busy .callerName:before {
content: "Busy: "; }
#callStatus.held {
background-color: #ff7474;
background-image: rgba(255, 255, 255, 0.3);
background-image: -moz-linear-gradient(top, rgba(255, 255, 255, 0.3), rgba(50, 50, 50, 0.1));
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0, rgba(255, 255, 255, 0.3)), color-stop(1, rgba(50, 50, 50, 0.1)));
-ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='$top', EndColorStr='$bottom');
border-top: 2px solid white;
border-bottom: 2px solid #bbbbbb;
-webkit-box-shadow: rgba(0, 0, 0, 0.2) 0 3px 5px;
-moz-box-shadow: rgba(0, 0, 0, 0.2) 0 3px 5px;
box-shadow: rgba(0, 0, 0, 0.2) 0 3px 5px;
-ms-filter: progid:DXImageTransform.Microsoft.Shadow(Color=rgba(0, 0, 0, 0.2),Direction=135,Strength=5); }
#callStatus.held .callerName:before {
content: "Held: "; }
#callStatus.conferenced {
background-color: #74e0ff;
background-image: rgba(255, 255, 255, 0.3);
......
src/plugins/rayo/src/demo/candybar.js
View file @ 950acddc
......@@ -56,15 +56,25 @@
buttons: [{
cls: 'end',
label: 'End Call'
},
{
cls: 'hold',
label: 'Hold Call'
}],
timer: true
},
busy: {
buttons: [{
cls: 'busy',
cls: 'join',
label: 'Join Call'
}],
},
held: {
buttons: [{
cls: 'join',
label: 'Unhold Call'
}],
},
conferenced: {
buttons: [{
cls: 'leave',
......@@ -236,6 +246,11 @@
self.call.leave();
}
};
self.hold = function () {
if (self.call) {
self.call.leave();
}
};
self.cancel = function () {
if (self.call) {
self.call.hangup();
......
src/plugins/rayo/src/demo/index.html
View file @ 950acddc
......@@ -56,6 +56,9 @@
} else if (window.dialer.getCallLabel() == "Leave") {
window.candybar.call.leave();
} else if (window.dialer.getCallLabel() == "Unhold") {
window.candybar.call.join();
} else {
console.error('bad call state');
}
......@@ -219,6 +222,13 @@
stopTone();
},
onHold: function(callId) {
//console.log('onHold ' + callId);
window.candybar.setState('held');
window.dialer.setCallLabel('Unhold');
},
onRing: function(callId, headers) {
//console.log('onRing ' + callId);
//console.log(headers);
......
src/plugins/rayo/src/demo/rayo-plugin.js
View file @ 950acddc
......@@ -51,23 +51,25 @@ Strophe.addConnectionPlugin('rayo',
hangup: function(callId)
{
console.log("hangup " + callId);
//console.log("hangup " + callId);
var that = this;
var iq = $iq({to: callId + "@rayo." + this._connection.domain, from: this._connection.jid, type: "get"}).c("hangup", {xmlns: Strophe.NS.RAYO_CORE});
//console.log(iq.toString());
that._connection.sendIQ(iq, null, function(error)
that._connection.sendIQ(iq, function()
{
this._onhook();
}, function(error) {
$('error', error).each(function()
{
var errorcode = $(this).attr('code');
if (that.callbacks && that.callbacks.onError) that.callbacks.onError("hangup failure " + errorcode);
});
});
this._onhook();
},
digit: function(callId, key)
......@@ -459,8 +461,8 @@ Strophe.addConnectionPlugin('rayo',
$(presence).find('joined').each(function()
{
//console.log('Rayo plugin handlePresence joined');
//console.log(presence);
if ($(this).attr('xmlns') == Strophe.NS.RAYO_CORE)
{
var callId = Strophe.getNodeFromJid(from);
......@@ -478,8 +480,8 @@ Strophe.addConnectionPlugin('rayo',
$(presence).find('unjoined').each(function()
{
//console.log('Rayo plugin handlePresence unjoined');
//console.log(presence);
if ($(this).attr('xmlns') == Strophe.NS.RAYO_CORE)
{
var callId = Strophe.getNodeFromJid(from);
......@@ -497,19 +499,34 @@ Strophe.addConnectionPlugin('rayo',
$(presence).find('started-speaking').each(function()
{
//console.log(presence);
if ($(this).attr('xmlns') == Strophe.NS.RAYO_CORE)
{
var callId = Strophe.getNodeFromJid(from);
//if (that.callbacks && that.callbacks.onSpeaking) that.callbacks.onSpeaking(callId, headers);
if (that.callbacks && that.callbacks.onSpeaking) that.callbacks.onSpeaking(callId, headers);
}
});
$(presence).find('stopped-speaking').each(function()
{
//console.log(presence);
if ($(this).attr('xmlns') == Strophe.NS.RAYO_CORE)
{
var callId = Strophe.getNodeFromJid(from);
//if (that.callbacks && that.callbacks.offSpeaking) that.callbacks.offSpeaking(callId, headers);
if (that.callbacks && that.callbacks.offSpeaking) that.callbacks.offSpeaking(callId, headers);
}
});
$(presence).find('onhold').each(function()
{
//console.log(presence);
if ($(this).attr('xmlns') == Strophe.NS.RAYO_CORE)
{
var callId = Strophe.getNodeFromJid(from);
if (that.callbacks && that.callbacks.onHold) that.callbacks.onHold(callId);
}
});
......@@ -524,7 +541,6 @@ Strophe.addConnectionPlugin('rayo',
$(presence).find('answered').each(function()
{
//console.log('Rayo plugin handlePresence answered');
//console.log(presence);
if ($(this).attr('xmlns') == Strophe.NS.RAYO_CORE)
......@@ -574,8 +590,8 @@ Strophe.addConnectionPlugin('rayo',
$(presence).find('end').each(function()
{
//console.log('Rayo plugin handlePresence end');
//console.log(presence);
if ($(this).attr('xmlns') == Strophe.NS.RAYO_CORE)
{
var callId = Strophe.getNodeFromJid(from);
......
src/plugins/rayo/src/java/com/sun/voip/CallParticipant.java
View file @ 950acddc
......@@ -94,6 +94,9 @@ public class CallParticipant {
private long startTimestamp = 0;
private long endTimestamp = 0;
private Map<String, String> headers = new HashMap<String, String>();
private CallParticipant farParty = null;
private CallParticipant handset = null;
private boolean isHeld = false;
/*
* Second party in a two party call or target of migration
......@@ -158,6 +161,26 @@ public class CallParticipant {
this.endTimestamp = endTimestamp;
}
public CallParticipant getFarParty()
{
return farParty;
}
public void setFarParty(CallParticipant farParty)
{
this.farParty = farParty;
}
public CallParticipant getHandset()
{
return handset;
}
public void setHandset(CallParticipant handset)
{
this.handset = handset;
}
public Map<String, String> getHeaders()
{
return headers;
......@@ -351,6 +374,10 @@ public class CallParticipant {
return isMuted;
}
public boolean isHeld() {
return isHeld;
}
/**
* Is the call muted from the whisper group
*/
......@@ -763,6 +790,10 @@ public class CallParticipant {
this.isMuted = isMuted;
}
public void setHeld(boolean isHeld) {
this.isHeld = isHeld;
}
/**
* Set the flag to mute the this call from the whisper group.
*/
......
src/plugins/rayo/src/java/org/ifsoft/rayo/RayoComponent.java
View file @ 950acddc
......@@ -17,8 +17,7 @@
package org.ifsoft.rayo;
import org.dom4j.Element;
import org.dom4j.DocumentHelper;
import org.dom4j.*;
import org.jivesoftware.openfire.SessionManager;
import org.jivesoftware.openfire.session.ClientSession;
......@@ -473,13 +472,7 @@ public class RayoComponent extends AbstractComponent
presence1.getElement().add(rayoProvider.toXML(new AnsweredEvent(null, headers)));
sendPacket(presence1);
RelayChannel channel = plugin.getRelayChannel(callId);
if (channel != null)
{
callHandler = channel.getCallHandler();
} else reply.setError(PacketError.Condition.item_not_found);
callHandler = CallHandler.findCall(callId);
} catch (Exception e) {
reply.setError(PacketError.Condition.item_not_found);
......@@ -495,11 +488,19 @@ public class RayoComponent extends AbstractComponent
{
Log.info("RayoComponent handleAnswerCommand found call handler " + callHandler);
CallParticipant cp = callHandler.getCallParticipant();
CallHandler handsetHandler = CallHandler.findCall(JID.escapeNode(iq.getFrom().toString()));
if (cp != null)
if (handsetHandler != null)
{
Log.info("RayoComponent handleAnswerCommand found handset handler " + handsetHandler);
try {
CallParticipant cp = callHandler.getCallParticipant();
CallParticipant hp = handsetHandler.getCallParticipant();
hp.setFarParty(cp);
cp.setHandset(hp);
cp.setStartTimestamp(System.currentTimeMillis());
cp.setHeaders(headers);
......@@ -727,14 +728,15 @@ public class RayoComponent extends AbstractComponent
{
String source = JID.escapeNode(handsetId);
RelayChannel channel = plugin.getRelayChannel(source); // user mixer of caller
CallHandler handsetHandler = CallHandler.findCall(source);
if (channel != null)
if (handsetHandler != null)
{
headers.put("mixer_name", channel.getHandset().mixer);
headers.put("codec_name", channel.getHandset().codec);
CallParticipant hp = handsetHandler.getCallParticipant();
ConferenceManager.setCallId(channel.getHandset().mixer, source);
headers.put("mixer_name", hp.getConferenceId());
ConferenceManager.setCallId(hp.getConferenceId(), source);
if (findUser(destination.getNode()) != null)
{
......@@ -989,9 +991,12 @@ public class RayoComponent extends AbstractComponent
CallParticipant hp = handsetHandler.getCallParticipant();
try {
hp.setFarParty(cp);
cp.setHandset(hp);
String mixer = hp.getConferenceId();
ConferenceManager conferenceManager = ConferenceManager.getConference( mixer,
ConferenceManager conferenceManager = ConferenceManager.getConference(mixer,
hp.getMediaPreference(),
cp.getName(), false);
cp.setConferenceId(mixer);
......@@ -1042,6 +1047,7 @@ public class RayoComponent extends AbstractComponent
Log.info("RayoComponent callEventNotification found call handler " + callHandler);
CallParticipant cp = callHandler.getCallParticipant();
CallParticipant hp = cp.getHandset();
if (cp != null)
{
......@@ -1073,16 +1079,12 @@ public class RayoComponent extends AbstractComponent
}
} else if ("250 STARTED SPEAKING".equals(myEvent)) {
StartedSpeakingEvent speaker = new StartedSpeakingEvent();
speaker.setSpeakerId(callEvent.getCallId());
presence.getElement().add(rayoProvider.toXML(speaker));
sendPacket(presence);
broadcastSpeaking(true, callEvent.getCallId(), callEvent.getConferenceId(), from);
} else if ("259 STOPPED SPEAKING".equals(myEvent)) {
StoppedSpeakingEvent speaker = new StoppedSpeakingEvent();
speaker.setSpeakerId(callEvent.getCallId());
presence.getElement().add(rayoProvider.toXML(speaker));
sendPacket(presence);
broadcastSpeaking(false, callEvent.getCallId(), callEvent.getConferenceId(), from);
} else if ("269 DTMF".equals(myEvent)) {
presence.getElement().add(rayoProvider.toXML(new DtmfEvent(callEvent.getCallId(), callEvent.getDtmfKey())));
......@@ -1102,6 +1104,53 @@ public class RayoComponent extends AbstractComponent
}
}
private void broadcastSpeaking(Boolean startSpeaking, String callId, String conferenceId, JID from)
{
Log.info( "RayoComponent broadcastSpeaking " + startSpeaking + " " + callId + " " + conferenceId + " " + from);
try {
ConferenceManager conferenceManager = ConferenceManager.findConferenceManager(conferenceId);
ArrayList memberList = conferenceManager.getMemberList();
synchronized (memberList)
{
for (int i = 0; i < memberList.size(); i++)
{
ConferenceMember member = (ConferenceMember) memberList.get(i);
CallHandler callHandler = member.getCallHandler();
CallParticipant cp = callHandler.getCallParticipant();
String target = cp.getCallOwner();
Log.info( "RayoComponent broadcastSpeaking checking " + target);
if (target != null && callId.equals(cp.getCallId()) == false)
{
Presence presence = new Presence();
presence.setFrom(callId + "@rayo." + getDomain());
presence.setTo(target);
if (startSpeaking)
{
StartedSpeakingEvent speaker = new StartedSpeakingEvent();
speaker.setSpeakerId(callId);
presence.getElement().add(rayoProvider.toXML(speaker));
} else {
StoppedSpeakingEvent speaker = new StoppedSpeakingEvent();
speaker.setSpeakerId(callId);
presence.getElement().add(rayoProvider.toXML(speaker));
}
sendPacket(presence);
}
}
}
} catch (Exception e) {
e.printStackTrace();
}
}
private void finishCallRecord(CallParticipant cp)
{
if (cp.getStartTimestamp() > 0)
......@@ -1191,23 +1240,43 @@ public class RayoComponent extends AbstractComponent
if (callId == null) callId = conferenceEvent.getConferenceId(); // special case of SIP incoming
CallHandler farParty = CallHandler.findCall(callId);
CallHandler callHandler = CallHandler.findCall(conferenceEvent.getCallId());
if (callHandler != null)
{
Log.info("RayoComponent notifyConferenceMonitors found call handler " + callHandler);
Log.info("RayoComponent notifyConferenceMonitors found call handler " + callHandler + " " + farParty);
CallParticipant callParticipant = callHandler.getCallParticipant();
if (callParticipant != null )
{
int memberCount = conferenceManager.getMemberList().size();
ArrayList memberList = conferenceManager.getMemberList();
if (conferenceEvent.equals(ConferenceEvent.MEMBER_LEFT))
{
CallParticipant hp = callParticipant.getHandset();
if (hp != null) // far party left
{
synchronized (memberList)
{
for (int i = 0; i < memberList.size(); i++)
{
CallHandler participant = ((ConferenceMember) memberList.get(i)).getCallHandler();
participant.cancelRequest("Far Party has left");
}
}
}
}
int memberCount = memberList.size();
Log.info("RayoComponent notifyConferenceMonitors found owner " + callParticipant.getCallOwner() + " " + memberCount);
if (groupName == null)
{
routeJoinEvent(callParticipant.getCallOwner(), callParticipant, conferenceEvent, memberCount, groupName, callId);
routeJoinEvent(callParticipant.getCallOwner(), callParticipant, conferenceEvent, memberCount, groupName, callId, farParty);
} else {
......@@ -1219,7 +1288,7 @@ public class RayoComponent extends AbstractComponent
for (ClientSession session : sessions)
{
routeJoinEvent(memberJID.toString(), callParticipant, conferenceEvent, memberCount, groupName, callId);
routeJoinEvent(session.getAddress().toString(), callParticipant, conferenceEvent, memberCount, groupName, callId, farParty);
}
}
}
......@@ -1239,9 +1308,9 @@ public class RayoComponent extends AbstractComponent
}
}
private void routeJoinEvent(String callee, CallParticipant callParticipant, ConferenceEvent conferenceEvent, int memberCount, String groupName, String callId)
private void routeJoinEvent(String callee, CallParticipant callParticipant, ConferenceEvent conferenceEvent, int memberCount, String groupName, String callId, CallHandler farParty)
{
Log.info( "RayoComponent routeJoinEvent " + callee + " " + callId + " " + groupName);
Log.info( "RayoComponent routeJoinEvent " + callee + " " + callId + " " + groupName + " " + memberCount + " " + farParty);
Presence presence = new Presence();
presence.setFrom(callId + "@rayo." + getDomain());
......@@ -1270,23 +1339,67 @@ public class RayoComponent extends AbstractComponent
sendPacket(presence);
} else { // caller with callee only
} else {
if (memberCount == 2) // callee
if (memberCount == 2) // caller with callee only
{
if (conferenceEvent.equals(ConferenceEvent.MEMBER_LEFT)) // previously conferenced
{
if (callId.equals(conferenceEvent.getCallId()) == false) // handset leaving
{
presence.getElement().add(rayoProvider.toXML(new AnsweredEvent(null, headers)));
sendPacket(presence);
}
} else {
if (callId.equals(conferenceEvent.getCallId())) // far party joined
{
presence.getElement().add(rayoProvider.toXML(new AnsweredEvent(null, headers)));
} else { // handset joined
if (farParty != null)
{
CallParticipant fp = farParty.getCallParticipant();
if (fp.isHeld())
{
fp.setHeld(false);
presence.getElement().add(rayoProvider.toXML(new AnsweredEvent(null, headers)));
} else {
presence.getElement().add(rayoProvider.toXML(new AnsweredEvent(null, headers)));
}
}
}
sendPacket(presence);
}
} else if (memberCount == 1) { // callee or caller
if (conferenceEvent.equals(ConferenceEvent.MEMBER_LEFT))
{
if (callId.equals(conferenceEvent.getCallId()) == false) // handset leaving
{
if (farParty != null)
{
CallParticipant fp = farParty.getCallParticipant();
fp.setHeld(true);
presence.getElement().add(toXML(new OnHoldEvent()));
sendPacket(presence);
}
}
}
} else { // nobody left, call ended
presence.getElement().add(rayoProvider.toXML(new EndEvent(null, EndEvent.Reason.valueOf("HANGUP"), headers)));
sendPacket(presence);
finishCallRecord(callParticipant);
}
}
}
}
......@@ -1334,6 +1447,7 @@ public class RayoComponent extends AbstractComponent
if (foundUser != null) // send this call to specific user
{
cp.setCallOwner(foundUser.toString());
routeSIPCall(foundUser, cp, callId, headers);
return true;
}
......@@ -1348,7 +1462,7 @@ public class RayoComponent extends AbstractComponent
for (ClientSession session : sessions)
{
routeSIPCall(memberJID, cp, callId, headers);
routeSIPCall(session.getAddress(), cp, callId, headers);
}
}
......@@ -1388,4 +1502,38 @@ public class RayoComponent extends AbstractComponent
sendPacket(presence);
}
}
private Element toXML(Object object)
{
try {
Document document = DocumentHelper.createDocument();
generateDocument(object, document);
return document.getRootElement();
} catch (Exception e) {
throw new IllegalStateException(e);
}
}
private void generateDocument(Object object, Document document) throws Exception
{
if (object instanceof OnHoldEvent) {
createOnHoldEvent((OnHoldEvent) object, document);
} else if (object instanceof OffHoldEvent) {
createOffHoldEvent((OffHoldEvent) object, document);
}
}
private Document createOnHoldEvent(OnHoldEvent onHold, Document document)
{
Element root = document.addElement(new QName("onhold", new Namespace("", "urn:xmpp:rayo:1")));
return document;
}
private Document createOffHoldEvent(OffHoldEvent offHold, Document document)
{
Element root = document.addElement(new QName("offhold", new Namespace("", "urn:xmpp:rayo:1")));
return document;
}
}
src/plugins/rayo/src/strophe.js/rayo-plugin.js
View file @ 950acddc
......@@ -51,23 +51,25 @@ Strophe.addConnectionPlugin('rayo',
hangup: function(callId)
{
console.log("hangup " + callId);
//console.log("hangup " + callId);
var that = this;
var iq = $iq({to: callId + "@rayo." + this._connection.domain, from: this._connection.jid, type: "get"}).c("hangup", {xmlns: Strophe.NS.RAYO_CORE});
//console.log(iq.toString());
that._connection.sendIQ(iq, null, function(error)
that._connection.sendIQ(iq, function()
{
this._onhook();
}, function(error) {
$('error', error).each(function()
{
var errorcode = $(this).attr('code');
if (that.callbacks && that.callbacks.onError) that.callbacks.onError("hangup failure " + errorcode);
});
});
this._onhook();
},
digit: function(callId, key)
......@@ -459,8 +461,8 @@ Strophe.addConnectionPlugin('rayo',
$(presence).find('joined').each(function()
{
//console.log('Rayo plugin handlePresence joined');
//console.log(presence);
if ($(this).attr('xmlns') == Strophe.NS.RAYO_CORE)
{
var callId = Strophe.getNodeFromJid(from);
......@@ -478,8 +480,8 @@ Strophe.addConnectionPlugin('rayo',
$(presence).find('unjoined').each(function()
{
//console.log('Rayo plugin handlePresence unjoined');
//console.log(presence);
if ($(this).attr('xmlns') == Strophe.NS.RAYO_CORE)
{
var callId = Strophe.getNodeFromJid(from);
......@@ -497,19 +499,34 @@ Strophe.addConnectionPlugin('rayo',
$(presence).find('started-speaking').each(function()
{
//console.log(presence);
if ($(this).attr('xmlns') == Strophe.NS.RAYO_CORE)
{
var callId = Strophe.getNodeFromJid(from);
//if (that.callbacks && that.callbacks.onSpeaking) that.callbacks.onSpeaking(callId, headers);
if (that.callbacks && that.callbacks.onSpeaking) that.callbacks.onSpeaking(callId, headers);
}
});
$(presence).find('stopped-speaking').each(function()
{
//console.log(presence);
if ($(this).attr('xmlns') == Strophe.NS.RAYO_CORE)
{
var callId = Strophe.getNodeFromJid(from);
//if (that.callbacks && that.callbacks.offSpeaking) that.callbacks.offSpeaking(callId, headers);
if (that.callbacks && that.callbacks.offSpeaking) that.callbacks.offSpeaking(callId, headers);
}
});
$(presence).find('onhold').each(function()
{
//console.log(presence);
if ($(this).attr('xmlns') == Strophe.NS.RAYO_CORE)
{
var callId = Strophe.getNodeFromJid(from);
if (that.callbacks && that.callbacks.onHold) that.callbacks.onHold(callId);
}
});
......@@ -524,7 +541,6 @@ Strophe.addConnectionPlugin('rayo',
$(presence).find('answered').each(function()
{
//console.log('Rayo plugin handlePresence answered');
//console.log(presence);
if ($(this).attr('xmlns') == Strophe.NS.RAYO_CORE)
......@@ -574,8 +590,8 @@ Strophe.addConnectionPlugin('rayo',
$(presence).find('end').each(function()
{
//console.log('Rayo plugin handlePresence end');
//console.log(presence);
if ($(this).attr('xmlns') == Strophe.NS.RAYO_CORE)
{
var callId = Strophe.getNodeFromJid(from);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023