Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • sweng-group-15/signalbuddy
1 result
Show changes
Commits on Source (2)
...@@ -24,6 +24,11 @@ function signalbuddy(server, config) { ...@@ -24,6 +24,11 @@ function signalbuddy(server, config) {
var _arguments = arguments; var _arguments = arguments;
var io = _socket2.default.listen(server); var io = _socket2.default.listen(server);
io.engine.generateId = function () /*req, callback*/{
return (0, _v2.default)();
};
io.on('connection', function (client) { io.on('connection', function (client) {
client.resources = { client.resources = {
screen: false, screen: false,
...@@ -139,7 +144,7 @@ function signalbuddy(server, config) { ...@@ -139,7 +144,7 @@ function signalbuddy(server, config) {
function getTurnServers(username) { function getTurnServers(username) {
// See https://github.com/coturn/coturn/wiki/turnserver#turn-rest-api for details // See https://github.com/coturn/coturn/wiki/turnserver#turn-rest-api for details
var acting_ice_turn_username = Math.floor(Date.now() / 1000) + config.ice.turn.timeout + "-" + username; var acting_ice_turn_username = Math.floor(Date.now() / 1000) + config.ice.turn.timeout + "-" + username.replace(/-/g, "");
var acting_ice_turn_password = _crypto2.default.createHmac('sha1', config.ice.turn.secret).update(acting_ice_turn_username).digest('base64'); var acting_ice_turn_password = _crypto2.default.createHmac('sha1', config.ice.turn.secret).update(acting_ice_turn_username).digest('base64');
return [(0, _normalice2.default)('turn:' + acting_ice_turn_username + ':' + acting_ice_turn_password + '@' + config.ice.host + ':' + config.ice.port)]; return [(0, _normalice2.default)('turn:' + acting_ice_turn_username + ':' + acting_ice_turn_password + '@' + config.ice.host + ':' + config.ice.port)];
......
...@@ -6,6 +6,11 @@ import normalice from 'normalice'; ...@@ -6,6 +6,11 @@ import normalice from 'normalice';
function signalbuddy(server, config) { function signalbuddy(server, config) {
const io = socketIO.listen(server); const io = socketIO.listen(server);
io.engine.generateId = function (/*req, callback*/) {
return uuidv4();
};
io.on('connection', (client) => { io.on('connection', (client) => {
client.resources = { client.resources = {
screen: false, screen: false,
...@@ -121,7 +126,7 @@ function signalbuddy(server, config) { ...@@ -121,7 +126,7 @@ function signalbuddy(server, config) {
function getTurnServers(username) { function getTurnServers(username) {
// See https://github.com/coturn/coturn/wiki/turnserver#turn-rest-api for details // See https://github.com/coturn/coturn/wiki/turnserver#turn-rest-api for details
const acting_ice_turn_username = (Math.floor(Date.now() / 1000) + config.ice.turn.timeout) + "-" + username const acting_ice_turn_username = (Math.floor(Date.now() / 1000) + config.ice.turn.timeout) + "-" + username.replace(/-/g, "")
const acting_ice_turn_password = crypto.createHmac('sha1', config.ice.turn.secret).update(acting_ice_turn_username).digest('base64') const acting_ice_turn_password = crypto.createHmac('sha1', config.ice.turn.secret).update(acting_ice_turn_username).digest('base64')
return [normalice(`turn:${acting_ice_turn_username}:${acting_ice_turn_password}@${config.ice.host}:${config.ice.port}`)] return [normalice(`turn:${acting_ice_turn_username}:${acting_ice_turn_password}@${config.ice.host}:${config.ice.port}`)]
......