Skip to content

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

Rayo Plugin - implemented RecordCommand 

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@13795 b35dd754-fafc-0310-a699-88a17e54d16e
parent 315325ed
Show whitespace changes
Inline Side-by-side
Showing with 384 additions and 69 deletions
src/plugins/rayo/src/demo/candybar.js
View file @ de9cab2e
......@@ -69,6 +69,10 @@
cls: 'redirect',
label: 'Redirect Call'
},
{
cls: 'record',
label: 'Record Voice'
},
{
cls: 'say',
label: 'Say Message'
......@@ -293,6 +297,11 @@
self.call.say(prompt("Please enter message:","tts:hello world, i love you"));
}
};
self.record = function () {
if (self.call) {
self.call.record(prompt("Please enter name:","greeting"));
}
};
self.pause = function () {
if (self.call.saying) {
self.call.saying.pause();
......
src/plugins/rayo/src/demo/index.html
View file @ de9cab2e
......@@ -211,11 +211,8 @@
//console.log('onAnswer ' + callId);
//console.log(headers);
if (window.candybar.redirect != callId)
{
window.candybar.setState('active');
window.dialer.setCallLabel('Hangup');
}
stopTone();
},
......@@ -294,17 +291,23 @@
},
onRedirect: function(callId) {
console.log('onRedirect ' + callId);
//console.log('onRedirect ' + callId);
window.candybar.endGently();
window.candybar.redirect = callId;
window.dialer.setCallLabel('Call');
stopTone();
},
onRedirecting: function(callId) {
console.log('onRedirecting ' + callId);
},
onRedirected: function(callId) {
//console.log('onRedirected ' + callId);
},
onSay: function(saying) {
console.log('Started saying ' + saying.sayId);
//console.log('Started saying ' + saying.sayId);
window.candybar.call.saying = saying;
},
......
src/plugins/rayo/src/demo/rayo-plugin.js
View file @ de9cab2e
......@@ -155,7 +155,7 @@ Strophe.addConnectionPlugin('rayo',
}
}
console.log(iq.toString());
//console.log(iq.toString());
that._connection.sendIQ(iq, function(response)
{
......@@ -168,7 +168,6 @@ Strophe.addConnectionPlugin('rayo',
});
}, function(error) {
console.log(error);
$('error', error).each(function()
{
......@@ -234,6 +233,25 @@ Strophe.addConnectionPlugin('rayo',
},
record: function(callId, fileName)
{
var to = "file:" + fileName + ".au";
console.log('Rayo plugin record ' + callId + " " + to);
var that = this;
var iq = $iq({to: callId + "@" + this._connection.domain, from: this._connection.jid, type: "get"}).c("record", {xmlns: Strophe.NS.RAYO_RECORD, to: to});
that._connection.sendIQ(iq, null, function(error)
{
$('error', error).each(function()
{
var errorcode = $(this).attr('code');
if (that.callbacks && that.callbacks.onError) that.callbacks.onError("record failure " + errorcode);
});
});
},
private: function(callId, flag)
{
//console.log('Rayo plugin private ' + callId + " " + flag);
......@@ -358,6 +376,7 @@ Strophe.addConnectionPlugin('rayo',
digit: function(tone) {that.digit(callId, tone);},
redirect: function(to) {that.redirect(to, headers);},
say: function(message) {that.say(callId, message);},
record: function(file) {that.record(callId, file);},
hangup: function() {that.hangup(callId);},
hold: function() {that.hold(callId);},
join: function() {that.join(mixer, headers);},
......@@ -557,7 +576,7 @@ Strophe.addConnectionPlugin('rayo',
_handlePresence: function(presence)
{
//console.log('Rayo plugin handlePresence');
console.log(presence);
//console.log(presence);
var that = this;
var from = $(presence).attr('from');
......@@ -603,6 +622,7 @@ Strophe.addConnectionPlugin('rayo',
digit: function(tone) {that.digit(callId, tone);},
redirect: function(to) {that.redirect(to, headers);},
say: function(message) {that.say(callId, message);},
record: function(file) {that.record(callId, file);},
hangup: function() {that.hangup(callId);},
hold: function() {that.hold(callId);},
answer: function() {that.answer(callId, mixer, headers, callFrom);},
......@@ -773,6 +793,28 @@ Strophe.addConnectionPlugin('rayo',
}
});
$(presence).find('transferring').each(function()
{
//console.log(presence);
if ($(this).attr('xmlns') == Strophe.NS.RAYO_HANDSET)
{
var callId = Strophe.getNodeFromJid(from);
if (that.callbacks && that.callbacks.onRedirecting) that.callbacks.onRedirecting(callId);
}
});
$(presence).find('transferred').each(function()
{
//console.log(presence);
if ($(this).attr('xmlns') == Strophe.NS.RAYO_HANDSET)
{
var callId = Strophe.getNodeFromJid(from);
if (that.callbacks && that.callbacks.onRedirected) that.callbacks.onRedirected(callId);
}
});
$(presence).find('answered').each(function()
{
//console.log(presence);
......@@ -804,6 +846,7 @@ Strophe.addConnectionPlugin('rayo',
var call = {
digit: function(tone) {that.digit(callId, tone);},
say: function(message) {that.say(callId, message);},
record: function(file) {that.record(callId, file);},
hangup: function() {that.hangup(callId);},
hold: function() {that.hold(callId);},
join: function() {that.join(mixer, headers);},
......
src/plugins/rayo/src/java/com/rayo/core/verb/TransferredEvent.java 0 → 100644
View file @ de9cab2e
package com.rayo.core.verb;
public class TransferredEvent extends AbstractVerbEvent {
public TransferredEvent() {}
public TransferredEvent(Verb verb) {
super(verb);
}
}
src/plugins/rayo/src/java/com/rayo/core/verb/TransferringEvent.java 0 → 100644
View file @ de9cab2e
package com.rayo.core.verb;
public class TransferringEvent extends AbstractVerbEvent {
public TransferringEvent() {}
public TransferringEvent(Verb verb) {
super(verb);
}
}
src/plugins/rayo/src/java/com/rayo/core/xml/providers/HandsetProvider.java
View file @ de9cab2e
......@@ -173,6 +173,12 @@ public class HandsetProvider extends BaseProvider {
} else if (object instanceof PublicEvent) {
createPublicEvent((PublicEvent) object, document);
} else if (object instanceof TransferredEvent) {
createTransferredEvent((TransferredEvent) object, document);
} else if (object instanceof TransferringEvent) {
createTransferringEvent((TransferringEvent) object, document);
}
}
......@@ -229,4 +235,13 @@ public class HandsetProvider extends BaseProvider {
document.addElement(new QName("public", NAMESPACE));
}
private void createTransferredEvent(TransferredEvent event, Document document)
{
document.addElement(new QName("transferred", NAMESPACE));
}
private void createTransferringEvent(TransferringEvent event, Document document)
{
document.addElement(new QName("transferring", NAMESPACE));
}
}
src/plugins/rayo/src/java/com/sun/voip/MediaInfo.java
View file @ de9cab2e
......@@ -45,7 +45,7 @@ public class MediaInfo {
(byte)0, RtpPacket.PCMU_ENCODING, 8000, 1, false));
supportedMedia.add(new MediaInfo(
(byte)101, RtpPacket.PCM_ENCODING, 8000, 1, true));
(byte)101, RtpPacket.PCM_ENCODING, 8000, 1, false));
supportedMedia.add(new MediaInfo(
(byte)102, RtpPacket.PCM_ENCODING, 8000, 2, false));
......
src/plugins/rayo/src/java/com/sun/voip/server/ConferenceManager.java
View file @ de9cab2e
......@@ -65,6 +65,8 @@ public class ConferenceManager {
private boolean privateCall = false;
private boolean transferCall = false;
private CallParticipant heldCall = null;
private String groupName = null;
......@@ -642,6 +644,26 @@ public class ConferenceManager {
}
}
public boolean isTransferCall()
{
return transferCall;
}
public static boolean isTransferCall(String conferenceId)
{
try {
ConferenceManager conferenceManager = findConferenceManager(conferenceId);
return conferenceManager.isTransferCall();
} catch (ParseException e) {
return false;
}
}
public void setTransferCall(boolean transferCall)
{
this.transferCall = transferCall;
}
public boolean isPrivateCall()
{
return privateCall;
......
src/plugins/rayo/src/java/com/sun/voip/server/SipUtil.java
View file @ de9cab2e
......@@ -139,7 +139,7 @@ public class SipUtil {
(byte)0, RtpPacket.PCMU_ENCODING, 8000, 1, false));
supportedMedia.add(new MediaInfo(
(byte)101, RtpPacket.PCM_ENCODING, 8000, 1, true));
(byte)101, RtpPacket.PCM_ENCODING, 8000, 1, false));
supportedMedia.add(new MediaInfo(
(byte)102, RtpPacket.PCM_ENCODING, 8000, 2, false));
......
src/plugins/rayo/src/java/org/ifsoft/rayo/RayoComponent.java
View file @ de9cab2e
......@@ -73,6 +73,7 @@ public class RayoComponent extends AbstractComponent
private static final Logger Log = LoggerFactory.getLogger(RayoComponent.class);
private static final String RAYO_CORE = "urn:xmpp:rayo:1";
private static final String RAYO_RECORD = "urn:xmpp:rayo:record:1";
private static final String RAYO_SAY = "urn:xmpp:tropo:say:1";
private static final String RAYO_HANDSET = "urn:xmpp:rayo:handset:1";
......@@ -88,6 +89,7 @@ public class RayoComponent extends AbstractComponent
private final RayoPlugin plugin;
private RayoProvider rayoProvider = null;
private RecordProvider recordProvider = null;
private SayProvider sayProvider = null;
private HandsetProvider handsetProvider = null;
......@@ -108,6 +110,10 @@ public class RayoComponent extends AbstractComponent
rayoProvider = new RayoProvider();
rayoProvider.setValidator(new Validator());
server.getIQDiscoInfoHandler().addServerFeature(RAYO_RECORD);
recordProvider = new RecordProvider();
recordProvider.setValidator(new Validator());
server.getIQDiscoInfoHandler().addServerFeature(RAYO_SAY);
sayProvider = new SayProvider();
sayProvider.setValidator(new Validator());
......@@ -133,6 +139,7 @@ public class RayoComponent extends AbstractComponent
XMPPServer server = XMPPServer.getInstance();
server.getIQDiscoInfoHandler().removeServerFeature(RAYO_CORE);
server.getIQDiscoInfoHandler().removeServerFeature(RAYO_RECORD);
server.getIQDiscoInfoHandler().removeServerFeature(RAYO_SAY);
server.getIQDiscoInfoHandler().removeServerFeature(RAYO_HANDSET);
......@@ -198,6 +205,23 @@ public class RayoComponent extends AbstractComponent
return reply;
}
if (RAYO_RECORD.equals(namespace)) {
IQ reply = null;
Object object = recordProvider.fromXML(element);
if (object instanceof Record) {
reply = handleRecord((Record) object, iq);
} else if (object instanceof PauseCommand) {
reply = handlePauseRecordCommand(true, iq);
} else if (object instanceof ResumeCommand) {
reply = handlePauseRecordCommand(false, iq);
}
return reply;
}
if (RAYO_SAY.equals(namespace)) {
IQ reply = null;
......@@ -207,10 +231,10 @@ public class RayoComponent extends AbstractComponent
reply = handleSay((Say) object, iq);
} else if (object instanceof PauseCommand) {
reply = handlePauseCommand(true, iq);
reply = handlePauseSayCommand(true, iq);
} else if (object instanceof ResumeCommand) {
reply = handlePauseCommand(false, iq);
reply = handlePauseSayCommand(false, iq);
}
return reply;
}
......@@ -245,10 +269,10 @@ public class RayoComponent extends AbstractComponent
dial.setFrom(new URI("xmpp:" + iq.getFrom()));
dial.setHeaders(redirect.getHeaders());
reply = handleDialCommand((DialCommand) dial, iq);
reply = handleDialCommand((DialCommand) dial, iq, true);
} else if (object instanceof DialCommand) {
reply = handleDialCommand((DialCommand) object, iq);
reply = handleDialCommand((DialCommand) object, iq, false);
} else if (object instanceof StopCommand) {
......@@ -565,6 +589,70 @@ public class RayoComponent extends AbstractComponent
}
private IQ handleRecord(Record command, IQ iq)
{
Log.info("RayoComponent handleRecord " + iq.getFrom());
IQ reply = IQ.createResultIQ(iq);
final String callId = JID.escapeNode(iq.getFrom().toString());
final String uri = command.getTo().toString();
CallHandler callHandler = CallHandler.findCall(callId);
if (callHandler != null)
{
try {
final String fileName = uri.substring(5); // expecting file: prefix
callHandler.getCallParticipant().setRecordDirectory(System.getProperty("com.sun.voip.server.Bridge.soundsDirectory", "."));
callHandler.getMemberReceiver().setRecordFromMember(true, fileName, "au");
final Element childElement = reply.setChildElement("ref", RAYO_CORE);
childElement.addAttribute(ID, fileName);
childElement.addAttribute(URI, (String) uri);
} catch (Exception e1) {
e1.printStackTrace();
reply.setError(PacketError.Condition.not_allowed);
}
} else {
reply.setError(PacketError.Condition.item_not_found);
}
return reply;
}
private IQ handlePauseRecordCommand(boolean flag, IQ iq)
{
Log.info("RayoComponent handlePauseRecordCommand " + iq.getFrom() + " " + iq.getTo());
IQ reply = IQ.createResultIQ(iq);
final String callId = JID.escapeNode(iq.getFrom().toString());
CallHandler callHandler = CallHandler.findCall(callId);
if (callHandler != null)
{
try {
CallParticipant cp = callHandler.getCallParticipant();
String fileName = cp.getFromRecordingFile();
cp.setRecordDirectory(System.getProperty("com.sun.voip.server.Bridge.soundsDirectory", "."));
callHandler.getMemberReceiver().setRecordFromMember(flag, fileName, "au");
} catch (Exception e1) {
e1.printStackTrace();
reply.setError(PacketError.Condition.not_allowed);
}
} else {
reply.setError(PacketError.Condition.item_not_found);
}
return reply;
}
private IQ handleSay(Say command, IQ iq)
{
Log.info("RayoComponent handleSay " + iq.getFrom());
......@@ -613,9 +701,9 @@ public class RayoComponent extends AbstractComponent
return reply;
}
private IQ handlePauseCommand(boolean flag, IQ iq)
private IQ handlePauseSayCommand(boolean flag, IQ iq)
{
Log.info("RayoComponent handlePauseCommand " + iq.getFrom() + " " + iq.getTo());
Log.info("RayoComponent handlePauseSayCommand " + iq.getFrom() + " " + iq.getTo());
IQ reply = IQ.createResultIQ(iq);
final JID entityId = getJID(iq.getTo().getNode());
......@@ -675,8 +763,7 @@ public class RayoComponent extends AbstractComponent
Presence presence = new Presence();
presence.setFrom(iq.getTo());
presence.setTo(callerId);
presence.getElement().add(rayoProvider.toXML(new RingingEvent(null, headers)));
setRingingState(presence, ConferenceManager.isTransferCall(mixer), headers);
sendPacket(presence);
} else reply.setError(PacketError.Condition.item_not_found);
......@@ -712,14 +799,19 @@ public class RayoComponent extends AbstractComponent
headers.put("call_action", "join");
try {
callHandler = CallHandler.findCall(callId);
handsetHandler = CallHandler.findCall(JID.escapeNode(callerId));
if (handsetHandler != null)
{
CallParticipant hp = handsetHandler.getCallParticipant();
Presence presence1 = new Presence(); //to caller
presence1.setFrom(iq.getTo());
presence1.setTo(callerId);
presence1.getElement().add(rayoProvider.toXML(new AnsweredEvent(null, headers)));
setAnsweredState(presence1, ConferenceManager.isTransferCall(hp.getConferenceId()), headers);
sendPacket(presence1);
callHandler = CallHandler.findCall(callId);
handsetHandler = CallHandler.findCall(JID.escapeNode(callerId));
}
} catch (Exception e) {
reply.setError(PacketError.Condition.item_not_found);
......@@ -896,7 +988,7 @@ public class RayoComponent extends AbstractComponent
return reply;
}
private IQ handleDialCommand(DialCommand command, IQ iq)
private IQ handleDialCommand(DialCommand command, IQ iq, boolean transferCall)
{
Log.info("RayoComponent handleHandsetDialCommand " + iq.getFrom());
......@@ -952,7 +1044,7 @@ public class RayoComponent extends AbstractComponent
cp.setName(calledName);
cp.setHeaders(headers);
reply = doPhoneAndPcCall(JID.escapeNode(handsetId), cp, reply);
reply = doPhoneAndPcCall(JID.escapeNode(handsetId), cp, reply, transferCall);
} else if (toXmpp){
......@@ -972,6 +1064,12 @@ public class RayoComponent extends AbstractComponent
headers.put("mixer_name", hp.getConferenceId());
try {
ConferenceManager conferenceManager = ConferenceManager.findConferenceManager(hp.getConferenceId());
conferenceManager.setTransferCall(transferCall);
} catch (Exception e) {}
if (findUser(destination.getNode()) != null)
{
routeXMPPCall(reply, destination, source, calledName, headers, hp.getConferenceId());
......@@ -1077,7 +1175,7 @@ public class RayoComponent extends AbstractComponent
}
private IQ doPhoneAndPcCall(String handsetId, CallParticipant cp, IQ reply)
private IQ doPhoneAndPcCall(String handsetId, CallParticipant cp, IQ reply, boolean transferCall)
{
Log.info("RayoComponent doPhoneAndPcCall " + handsetId);
......@@ -1086,7 +1184,7 @@ public class RayoComponent extends AbstractComponent
if (handsetHandler != null)
{
try {
setMixer(handsetHandler, reply, cp);
setMixer(handsetHandler, reply, cp, transferCall);
OutgoingCallHandler outgoingCallHandler = new OutgoingCallHandler(this, cp);
......@@ -1110,7 +1208,7 @@ public class RayoComponent extends AbstractComponent
return reply;
}
private void setMixer(CallHandler handsetHandler, IQ reply, CallParticipant cp)
private void setMixer(CallHandler handsetHandler, IQ reply, CallParticipant cp, boolean transferCall)
{
CallParticipant hp = handsetHandler.getCallParticipant();
......@@ -1128,6 +1226,7 @@ public class RayoComponent extends AbstractComponent
cp.setConferenceId(mixer);
cp.setCallId(mixer);
conferenceManager.setCallId(mixer);
conferenceManager.setTransferCall(transferCall);
String recording = mixer + "-" + cp.getStartTimestamp() + ".au";
conferenceManager.recordConference(true, recording, "au");
......@@ -1194,7 +1293,7 @@ public class RayoComponent extends AbstractComponent
if (cp.isAutoAnswer() == false) // SIP handset, no ringing event
{
presence.getElement().add(rayoProvider.toXML(new RingingEvent(null, headers)));
setRingingState(presence, ConferenceManager.isTransferCall(callEvent.getConferenceId()), headers);
sendPacket(presence);
}
......@@ -1407,7 +1506,7 @@ public class RayoComponent extends AbstractComponent
if (groupName == null)
{
routeJoinEvent(callParticipant.getCallOwner(), callParticipant, conferenceEvent, memberCount, groupName, callId, farParty);
routeJoinEvent(callParticipant.getCallOwner(), callParticipant, conferenceEvent, memberCount, groupName, callId, farParty, conferenceManager);
} else {
......@@ -1419,7 +1518,7 @@ public class RayoComponent extends AbstractComponent
for (ClientSession session : sessions)
{
routeJoinEvent(session.getAddress().toString(), callParticipant, conferenceEvent, memberCount, groupName, callId, farParty);
routeJoinEvent(session.getAddress().toString(), callParticipant, conferenceEvent, memberCount, groupName, callId, farParty, conferenceManager);
}
}
}
......@@ -1444,6 +1543,10 @@ public class RayoComponent extends AbstractComponent
sendPacket(presence);
}
}
} else if (memberCount == 2) {
conferenceManager.setTransferCall(false); // reset after informing on redirect
}
}
}
......@@ -1455,7 +1558,7 @@ public class RayoComponent extends AbstractComponent
}
}
private void routeJoinEvent(String callee, CallParticipant callParticipant, ConferenceEvent conferenceEvent, int memberCount, String groupName, String callId, CallHandler farParty)
private void routeJoinEvent(String callee, CallParticipant callParticipant, ConferenceEvent conferenceEvent, int memberCount, String groupName, String callId, CallHandler farParty, ConferenceManager conferenceManager)
{
Log.info( "RayoComponent routeJoinEvent " + callee + " " + callId + " " + groupName + " " + memberCount + " " + farParty);
......@@ -1504,7 +1607,7 @@ public class RayoComponent extends AbstractComponent
{
Log.info( "RayoComponent routeJoinEvent handset leaving ");
presence.getElement().add(rayoProvider.toXML(new AnsweredEvent(null, headers)));
setAnsweredState(presence, conferenceManager.isTransferCall(), headers);
sendPacket(presence);
} else {
......@@ -1519,7 +1622,7 @@ public class RayoComponent extends AbstractComponent
{
Log.info( "RayoComponent routeJoinEvent far party joined ");
presence.getElement().add(rayoProvider.toXML(new AnsweredEvent(null, headers)));
setAnsweredState(presence, conferenceManager.isTransferCall(), headers);
sendPacket(presence);
} else { // handset joined
......@@ -1535,8 +1638,8 @@ public class RayoComponent extends AbstractComponent
Log.info( "RayoComponent routeJoinEvent on hold ");
fp.setHeld(false);
ConferenceManager.setHeldCall(conferenceEvent.getConferenceId(), null);
presence.getElement().add(rayoProvider.toXML(new AnsweredEvent(null, headers)));
conferenceManager.setHeldCall(null);
setAnsweredState(presence, conferenceManager.isTransferCall(), headers);
sendPacket(presence);
} else {
......@@ -1546,7 +1649,7 @@ public class RayoComponent extends AbstractComponent
{
Log.info( "RayoComponent routeJoinEvent handset joing sip call");
presence.getElement().add(rayoProvider.toXML(new AnsweredEvent(null, headers)));
setAnsweredState(presence, conferenceManager.isTransferCall(), headers);
sendPacket(presence);
}
}
......@@ -1575,7 +1678,7 @@ public class RayoComponent extends AbstractComponent
presence.getElement().add(handsetProvider.toXML(new OnHoldEvent()));
sendPacket(presence);
ConferenceManager.setHeldCall(conferenceEvent.getConferenceId(), callParticipant);
conferenceManager.setHeldCall(callParticipant);
}
}
......@@ -1590,7 +1693,7 @@ public class RayoComponent extends AbstractComponent
presence.getElement().add(handsetProvider.toXML(new OnHoldEvent()));
sendPacket(presence);
ConferenceManager.setHeldCall(conferenceEvent.getConferenceId(), farParty.getCallParticipant());
conferenceManager.setHeldCall(farParty.getCallParticipant());
} else {
finishCallRecord(callParticipant);
......@@ -1612,6 +1715,26 @@ public class RayoComponent extends AbstractComponent
}
private void setAnsweredState(Presence presence, boolean isTransfer, Map<String, String> headers)
{
if (isTransfer)
{
presence.getElement().add(handsetProvider.toXML(new TransferredEvent()));
} else {
presence.getElement().add(rayoProvider.toXML(new AnsweredEvent(null, headers)));
}
}
private void setRingingState(Presence presence, boolean isTransfer, Map<String, String> headers)
{
if (isTransfer)
{
presence.getElement().add(handsetProvider.toXML(new TransferringEvent()));
} else {
presence.getElement().add(rayoProvider.toXML(new RingingEvent(null, headers)));
}
}
private JID findUser(String username)
{
Collection<ClientSession> sessions = SessionManager.getInstance().getSessions();
......@@ -1740,8 +1863,12 @@ public class RayoComponent extends AbstractComponent
private IQHandler holdIQHandler = null;
private IQHandler sayIQHandler = null;
private IQHandler pauseIQHandler = null;
private IQHandler resumeIQHandler = null;
private IQHandler pauseSayIQHandler = null;
private IQHandler resumeSayIQHandler = null;
private IQHandler recordIQHandler = null;
private IQHandler pauseRecordIQHandler = null;
private IQHandler resumeRecordIQHandler = null;
private IQHandler acceptIQHandler = null;
private IQHandler answerIQHandler = null;
......@@ -1762,9 +1889,13 @@ public class RayoComponent extends AbstractComponent
unmuteIQHandler = new UnmuteIQHandler(); server.getIQRouter().addHandler(unmuteIQHandler);
holdIQHandler = new HoldIQHandler(); server.getIQRouter().addHandler(holdIQHandler);
recordIQHandler = new RecordIQHandler(); server.getIQRouter().addHandler(recordIQHandler);
pauseRecordIQHandler = new PauseRecordIQHandler(); server.getIQRouter().addHandler(pauseRecordIQHandler);
resumeRecordIQHandler = new ResumeRecordIQHandler(); server.getIQRouter().addHandler(resumeRecordIQHandler);
sayIQHandler = new SayIQHandler(); server.getIQRouter().addHandler(sayIQHandler);
pauseIQHandler = new PauseIQHandler(); server.getIQRouter().addHandler(pauseIQHandler);
resumeIQHandler = new ResumeIQHandler(); server.getIQRouter().addHandler(resumeIQHandler);
pauseSayIQHandler = new PauseSayIQHandler(); server.getIQRouter().addHandler(pauseSayIQHandler);
resumeSayIQHandler = new ResumeSayIQHandler(); server.getIQRouter().addHandler(resumeSayIQHandler);
acceptIQHandler = new AcceptIQHandler(); server.getIQRouter().addHandler(acceptIQHandler);
answerIQHandler = new AnswerIQHandler(); server.getIQRouter().addHandler(answerIQHandler);
......@@ -1787,8 +1918,8 @@ public class RayoComponent extends AbstractComponent
if (holdIQHandler != null) {server.getIQRouter().removeHandler(holdIQHandler); holdIQHandler = null;}
if (sayIQHandler != null) {server.getIQRouter().removeHandler(sayIQHandler); sayIQHandler = null;}
if (pauseIQHandler != null) {server.getIQRouter().removeHandler(pauseIQHandler); pauseIQHandler = null;}
if (resumeIQHandler != null) {server.getIQRouter().removeHandler(resumeIQHandler); resumeIQHandler = null;}
if (pauseSayIQHandler != null) {server.getIQRouter().removeHandler(pauseSayIQHandler); pauseSayIQHandler = null;}
if (resumeSayIQHandler != null) {server.getIQRouter().removeHandler(resumeSayIQHandler); resumeSayIQHandler = null;}
if (acceptIQHandler != null) {server.getIQRouter().removeHandler(acceptIQHandler); acceptIQHandler = null;}
if (answerIQHandler != null) {server.getIQRouter().removeHandler(answerIQHandler); answerIQHandler = null;}
......@@ -1854,6 +1985,31 @@ public class RayoComponent extends AbstractComponent
private class RecordIQHandler extends IQHandler
{
public RecordIQHandler() { super("Rayo: XEP 0327 - Record");}
@Override public IQ handleIQ(IQ iq) {try {return handleIQGet(iq);} catch(Exception e) { return null;}}
@Override public IQHandlerInfo getInfo() { return new IQHandlerInfo("record", RAYO_RECORD); }
}
private class PauseRecordIQHandler extends IQHandler
{
public PauseRecordIQHandler() { super("Rayo: XEP 0327 - Pause Record");}
@Override public IQ handleIQ(IQ iq) {try {return handleIQGet(iq);} catch(Exception e) { return null;}}
@Override public IQHandlerInfo getInfo() { return new IQHandlerInfo("pause", RAYO_RECORD); }
}
private class ResumeRecordIQHandler extends IQHandler
{
public ResumeRecordIQHandler() { super("Rayo: XEP 0327 - Resume Record");}
@Override public IQ handleIQ(IQ iq) {try {return handleIQGet(iq);} catch(Exception e) { return null;}}
@Override public IQHandlerInfo getInfo() { return new IQHandlerInfo("resume", RAYO_RECORD); }
}
private class SayIQHandler extends IQHandler
{
......@@ -1863,17 +2019,17 @@ public class RayoComponent extends AbstractComponent
@Override public IQHandlerInfo getInfo() { return new IQHandlerInfo("say", RAYO_SAY); }
}
private class PauseIQHandler extends IQHandler
private class PauseSayIQHandler extends IQHandler
{
public PauseIQHandler() { super("Rayo: XEP 0327 - Pause Say");}
public PauseSayIQHandler() { super("Rayo: XEP 0327 - Pause Say");}
@Override public IQ handleIQ(IQ iq) {try {return handleIQGet(iq);} catch(Exception e) { return null;}}
@Override public IQHandlerInfo getInfo() { return new IQHandlerInfo("pause", RAYO_SAY); }
}
private class ResumeIQHandler extends IQHandler
private class ResumeSayIQHandler extends IQHandler
{
public ResumeIQHandler() { super("Rayo: XEP 0327 - Resume Say");}
public ResumeSayIQHandler() { super("Rayo: XEP 0327 - Resume Say");}
@Override public IQ handleIQ(IQ iq) {try {return handleIQGet(iq);} catch(Exception e) { return null;}}
@Override public IQHandlerInfo getInfo() { return new IQHandlerInfo("resume", RAYO_SAY); }
......
src/plugins/rayo/src/java/org/voicebridge/Application.java
View file @ de9cab2e
......@@ -49,7 +49,9 @@ public class Application implements CallEventListener {
System.setProperty("com.sun.voip.server.PROTOCOL", config.getDefaultProtocol());
System.setProperty("com.sun.voip.server.SIP_PORT", config.getDefaultSIPPort());
System.setProperty("com.sun.voip.server.Bridge.recordDirectory", webHome + File.separator + "recordings");
System.setProperty("com.sun.voip.server.Bridge.soundsDirectory", webHome + File.separator + "sounds");
System.setProperty("com.sun.voip.server.Bridge.soundPath", "/com/sun/voip/server/sounds:" + webHome + File.separator + "sounds");
System.setProperty("freetts.voices", "com.sun.speech.freetts.en.us.cmu_us_kal.KevinVoiceDirectory");
Properties properties = new Properties();
......
src/plugins/rayo/src/strophe.js/rayo-plugin.js
View file @ de9cab2e
......@@ -155,7 +155,7 @@ Strophe.addConnectionPlugin('rayo',
}
}
console.log(iq.toString());
//console.log(iq.toString());
that._connection.sendIQ(iq, function(response)
{
......@@ -168,7 +168,6 @@ Strophe.addConnectionPlugin('rayo',
});
}, function(error) {
console.log(error);
$('error', error).each(function()
{
......@@ -234,6 +233,25 @@ Strophe.addConnectionPlugin('rayo',
},
record: function(callId, fileName)
{
var to = "file:" + fileName + ".au";
console.log('Rayo plugin record ' + callId + " " + to);
var that = this;
var iq = $iq({to: callId + "@" + this._connection.domain, from: this._connection.jid, type: "get"}).c("record", {xmlns: Strophe.NS.RAYO_RECORD, to: to});
that._connection.sendIQ(iq, null, function(error)
{
$('error', error).each(function()
{
var errorcode = $(this).attr('code');
if (that.callbacks && that.callbacks.onError) that.callbacks.onError("record failure " + errorcode);
});
});
},
private: function(callId, flag)
{
//console.log('Rayo plugin private ' + callId + " " + flag);
......@@ -358,6 +376,7 @@ Strophe.addConnectionPlugin('rayo',
digit: function(tone) {that.digit(callId, tone);},
redirect: function(to) {that.redirect(to, headers);},
say: function(message) {that.say(callId, message);},
record: function(file) {that.record(callId, file);},
hangup: function() {that.hangup(callId);},
hold: function() {that.hold(callId);},
join: function() {that.join(mixer, headers);},
......@@ -557,7 +576,7 @@ Strophe.addConnectionPlugin('rayo',
_handlePresence: function(presence)
{
//console.log('Rayo plugin handlePresence');
console.log(presence);
//console.log(presence);
var that = this;
var from = $(presence).attr('from');
......@@ -603,6 +622,7 @@ Strophe.addConnectionPlugin('rayo',
digit: function(tone) {that.digit(callId, tone);},
redirect: function(to) {that.redirect(to, headers);},
say: function(message) {that.say(callId, message);},
record: function(file) {that.record(callId, file);},
hangup: function() {that.hangup(callId);},
hold: function() {that.hold(callId);},
answer: function() {that.answer(callId, mixer, headers, callFrom);},
......@@ -773,6 +793,28 @@ Strophe.addConnectionPlugin('rayo',
}
});
$(presence).find('transferring').each(function()
{
//console.log(presence);
if ($(this).attr('xmlns') == Strophe.NS.RAYO_HANDSET)
{
var callId = Strophe.getNodeFromJid(from);
if (that.callbacks && that.callbacks.onRedirecting) that.callbacks.onRedirecting(callId);
}
});
$(presence).find('transferred').each(function()
{
//console.log(presence);
if ($(this).attr('xmlns') == Strophe.NS.RAYO_HANDSET)
{
var callId = Strophe.getNodeFromJid(from);
if (that.callbacks && that.callbacks.onRedirected) that.callbacks.onRedirected(callId);
}
});
$(presence).find('answered').each(function()
{
//console.log(presence);
......@@ -804,6 +846,7 @@ Strophe.addConnectionPlugin('rayo',
var call = {
digit: function(tone) {that.digit(callId, tone);},
say: function(message) {that.say(callId, message);},
record: function(file) {that.record(callId, file);},
hangup: function() {that.hangup(callId);},
hold: function() {that.hold(callId);},
join: function() {that.join(mixer, headers);},
......
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